[SCM] libav/experimental: 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.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit c81185a18333b28439476fdc00979225158c8755
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Fri Apr 10 00:09:07 2009 +0000

    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

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index f39b49d..7a24a4d 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:

-- 
Libav/FFmpeg packaging