Make sure mpeg2 has its height rounded up to 32 as that is needed
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 10 Apr 2009 00:09:07 +0000 (00:09 +0000)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 10 Apr 2009 00:09:07 +0000 (00:09 +0000)
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

index f39b49d..7a24a4d 100644 (file)
@@ -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: