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 a0e71d4d2e3ae0cba0af6f4cb58d5bfcd2c3a02d..4d63fe58d2772e1cfd90b023562a6f92aa07ac5c 100644 (file)
--- 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;