From c81185a18333b28439476fdc00979225158c8755 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Fri, 10 Apr 2009 00:09:07 +0000 Subject: [PATCH] Make sure mpeg2 has its height rounded up to 32 as that is needed for interlaced stuff. This might have been exploitable when emu edge was not set though note this bug has been introduced just a few days ago. Originally committed as revision 18405 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/utils.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index f39b49d511..7a24a4d246 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -144,6 +144,8 @@ void avcodec_align_dimensions(AVCodecContext *s, int *width, int *height){ case PIX_FMT_YUVA420P: w_align= 16; //FIXME check for non mpeg style codecs and use less alignment h_align= 16; + if(s->codec_id == CODEC_ID_MPEG2VIDEO) + h_align= 32; // interlaced is rounded up to 2 MBs break; case PIX_FMT_YUV411P: case PIX_FMT_UYYVYY411: