do not fail badly if aspect ratio is 0/forbidden, fix issue 369

Originally committed as revision 12434 to svn://svn.ffmpeg.org/ffmpeg/trunk
pull/126/head
Baptiste Coudurier 17 years ago
parent 32573a74bf
commit a2338352be
  1. 2
      libavcodec/mpeg12.c

@ -1970,8 +1970,6 @@ static int mpeg1_decode_sequence(AVCodecContext *avctx,
(width % 2) != 0 || (height % 2) != 0) (width % 2) != 0 || (height % 2) != 0)
return -1; return -1;
s->aspect_ratio_info= get_bits(&s->gb, 4); s->aspect_ratio_info= get_bits(&s->gb, 4);
if (s->aspect_ratio_info == 0)
return -1;
s->frame_rate_index = get_bits(&s->gb, 4); s->frame_rate_index = get_bits(&s->gb, 4);
if (s->frame_rate_index == 0 || s->frame_rate_index > 13) if (s->frame_rate_index == 0 || s->frame_rate_index > 13)
return -1; return -1;

Loading…
Cancel
Save