X-Git-Url: https://git.videolan.org/?p=ffmpeg.git;a=blobdiff_plain;f=libavformat%2Frmdec.c;h=d61f56908cd745938f084e74200826cd94fa6129;hp=afa37de7362f4b5cfcf0b7157b912adafaca2d1c;hb=0f310a6f333b016d336674d086045e8473fdf918;hpb=e7bf085b78586a04b918f4e76587779d04674700;ds=sidebyside diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c index afa37de736..d61f56908c 100644 --- a/libavformat/rmdec.c +++ b/libavformat/rmdec.c @@ -332,8 +332,13 @@ ff_rm_read_mdpr_codecdata (AVFormatContext *s, AVIOContext *pb, if ((ret = rm_read_extradata(pb, st->codec, codec_data_size - (avio_tell(pb) - codec_pos))) < 0) return ret; - av_reduce(&st->avg_frame_rate.den, &st->avg_frame_rate.num, - 0x10000, fps, (1 << 30) - 1); + if (fps > 0) { + av_reduce(&st->avg_frame_rate.den, &st->avg_frame_rate.num, + 0x10000, fps, (1 << 30) - 1); + } else if (s->error_recognition & AV_EF_EXPLODE) { + av_log(s, AV_LOG_ERROR, "Invalid framerate\n"); + return AVERROR_INVALIDDATA; + } } skip: