aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/mjpeg.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2007-04-14 22:22:34 +0000
committerMichael Niedermayer <michaelni@gmx.at>2007-04-14 22:22:34 +0000
commit6b5e72c994593d49365fa0485ebe8909db7f1587 (patch)
tree780fc6b6841ac8e226a292cb9341163f6d608f52 /libavcodec/mjpeg.c
parent6c3dba5760a18dff23213d0c4de7f57065a4648c (diff)
downloadffmpeg-6b5e72c994593d49365fa0485ebe8909db7f1587.tar.gz
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
Diffstat (limited to 'libavcodec/mjpeg.c')
-rw-r--r--libavcodec/mjpeg.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/mjpeg.c b/libavcodec/mjpeg.c
index a0e71d4d2e..4d63fe58d2 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;