[SCM] libav/experimental: fix playback of odd_height.mov this isnt the most beautifull solution but at least it works independant of the random height in mov and it doesnt add any secholes

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 6b5e72c994593d49365fa0485ebe8909db7f1587
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Sat Apr 14 22:22:34 2007 +0000

    fix playback of odd_height.mov
    this isnt the most beautifull solution but at least it works independant of the
    random height in mov and it doesnt add any secholes
    
    Originally committed as revision 8736 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/mjpeg.c b/libavcodec/mjpeg.c
index a0e71d4..4d63fe5 100644
--- a/libavcodec/mjpeg.c
+++ b/libavcodec/mjpeg.c
@@ -1125,6 +1125,10 @@ static int mjpeg_decode_sof(MJpegDecodeContext *s)
     height = get_bits(&s->gb, 16);
     width = get_bits(&s->gb, 16);
 
+    //HACK for odd_height.mov
+    if(s->interlaced && s->width == width && s->height == height + 1)
+        height= s->height;
+
     av_log(s->avctx, AV_LOG_DEBUG, "sof0: picture: %dx%d\n", width, height);
     if(avcodec_check_dimensions(s->avctx, width, height))
         return -1;

-- 
Libav/FFmpeg packaging