From 6b5e72c994593d49365fa0485ebe8909db7f1587 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 14 Apr 2007 22:22:34 +0000 Subject: [PATCH] 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 --- libavcodec/mjpeg.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/mjpeg.c b/libavcodec/mjpeg.c index a0e71d4d2..4d63fe58d 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; -- 2.11.0