generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lavf: Avoid setting avg_frame_rate if delta_dts is negative

Browse Source 
This avoids setting avg_frame_rate to invalid (negative)
values.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit ce67f442be)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
This commit is contained in:
Martin Storsjö
2013-09-20 12:20:06 +03:00
committed by Luca Barbato
parent a6a8f66608
commit 17e7edf75b
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/utils.c
View File

@@ -2499,7 +2499,8 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options)
double best_error = 0.01; double best_error = 0.01;
if (delta_dts >= INT64_MAX / st->time_base.num || if (delta_dts >= INT64_MAX / st->time_base.num ||
delta_packets >= INT64_MAX / st->time_base.den) delta_packets >= INT64_MAX / st->time_base.den ||
delta_dts < 0)
continue; continue;
av_reduce(&st->avg_frame_rate.num, &st->avg_frame_rate.den, av_reduce(&st->avg_frame_rate.num, &st->avg_frame_rate.den,
delta_packets*(int64_t)st->time_base.den, delta_packets*(int64_t)st->time_base.den,