Mercurial > mplayer.hg

comparison libmpcodecs/vf_ass.c @ 34885:e8af23854aa1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use correct variable for height. Fixes possible assert failures if direct rendering was used and height was padded caused by a too small dirty_rows array.
author reimar
date Tue, 29 May 2012 18:32:35 +0000
parents 3efd3d87424b
children 387485e3956a
comparison
equal deleted inserted replaced
34884:57bb464310a7 34885:e8af23854aa1
278 int src_stride = vf->priv->outw; 278 int src_stride = vf->priv->outw;
279 279
280 unsigned char *dst = vf->dmpi->planes[pl]; 280 unsigned char *dst = vf->dmpi->planes[pl];
281 unsigned char *src = vf->priv->planes[pl]; 281 unsigned char *src = vf->priv->planes[pl];
282 unsigned char *src_next = vf->priv->planes[pl] + src_stride; 282 unsigned char *src_next = vf->priv->planes[pl] + src_stride;
283 for (i = 0; i < vf->dmpi->chroma_height; ++i) { 283 for (i = 0; i < vf->priv->outh / 2; ++i) {
284 if ((vf->priv->dirty_rows[i * 2] == 1)) { 284 if ((vf->priv->dirty_rows[i * 2] == 1)) {
285 assert(vf->priv->dirty_rows[i * 2 + 1] == 1); 285 assert(vf->priv->dirty_rows[i * 2 + 1] == 1);
286 for (j = 0, k = 0; j < vf->dmpi->chroma_width; ++j, k += 2) { 286 for (j = 0, k = 0; j < vf->dmpi->chroma_width; ++j, k += 2) {
287 unsigned val = 0; 287 unsigned val = 0;
288 val += *(src + k); 288 val += *(src + k);