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
pull/126/head
Michael Niedermayer 18 years ago
parent 6c3dba5760
commit 6b5e72c994
  1. 4
      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;

Loading…
Cancel
Save