comparison utils.c @ 6388:c6c5bcca56d9 libavcodec

Remove apparently unneeded and buggy align.
author michael
date Fri, 22 Feb 2008 19:27:22 +0000
parents e961197141c0
children 27a6801cbb27
comparison
equal deleted inserted replaced
6387:922774d1fb9c 6388:c6c5bcca56d9
286 } 286 }
287 avcodec_align_dimensions(s, &w, &h); 287 avcodec_align_dimensions(s, &w, &h);
288 288
289 ff_fill_linesize(&picture, s->pix_fmt, w); 289 ff_fill_linesize(&picture, s->pix_fmt, w);
290 290
291 for (i=1; i<4; i++) 291 for (i=0; i<4; i++)
292 picture.linesize[i] = ALIGN(picture.linesize[i], STRIDE_ALIGN); 292 picture.linesize[i] = ALIGN(picture.linesize[i], STRIDE_ALIGN);
293
294 /* next ensures that linesize= 2^x uvlinesize, that is needed because
295 * some MC code assumes it */
296 if (picture.linesize[1])
297 picture.linesize[0] = ALIGN(picture.linesize[0], picture.linesize[1]);
298 else
299 picture.linesize[0] = ALIGN(picture.linesize[0], STRIDE_ALIGN);
300 293
301 tmpsize = ff_fill_pointer(&picture, NULL, s->pix_fmt, h); 294 tmpsize = ff_fill_pointer(&picture, NULL, s->pix_fmt, h);
302 295
303 for (i=0; i<3 && picture.data[i+1]; i++) 296 for (i=0; i<3 && picture.data[i+1]; i++)
304 size[i] = picture.data[i+1] - picture.data[i]; 297 size[i] = picture.data[i+1] - picture.data[i];