Make sure mpeg2 has its height rounded up to 32 as that is needed

for iterlaced stuff.
This might have been exploitable when emu edge was not set though
note this bug has been introduced just a few days ago.

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@18405 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index f39b49d5119845c05eef511c9cc042924632151b..7a24a4d246a4580aad5125f700844e9eef15531e 100644 (file)
--- 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: