aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2008-02-22 19:27:22 +0000
committerMichael Niedermayer <michaelni@gmx.at>2008-02-22 19:27:22 +0000
commita939a005f97abd2946bcad4cbfe9d700f3689c51 (patch)
tree0b58a1fc5c4ddc8a30c41a6e057d1471fc9be0bb
parent18ee626cec298637cdfbe83b75fdb61c57c65be8 (diff)
downloadffmpeg-a939a005f97abd2946bcad4cbfe9d700f3689c51.tar.gz
Remove apparently unneeded and buggy align.
Originally committed as revision 12179 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/utils.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 1a32c2c48f..c99a4d5cd2 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -288,16 +288,9 @@ int avcodec_default_get_buffer(AVCodecContext *s, AVFrame *pic){
ff_fill_linesize(&picture, s->pix_fmt, w);
- for (i=1; i<4; i++)
+ for (i=0; i<4; i++)
picture.linesize[i] = ALIGN(picture.linesize[i], STRIDE_ALIGN);
- /* next ensures that linesize= 2^x uvlinesize, that is needed because
- * some MC code assumes it */
- if (picture.linesize[1])
- picture.linesize[0] = ALIGN(picture.linesize[0], picture.linesize[1]);
- else
- picture.linesize[0] = ALIGN(picture.linesize[0], STRIDE_ALIGN);
-
tmpsize = ff_fill_pointer(&picture, NULL, s->pix_fmt, h);
for (i=0; i<3 && picture.data[i+1]; i++)