ffmpeg | branch: master | Carl Eugen Hoyos <ceho...@ag.or.at> | Sat Sep 24 13:07:39 2016 +0200| [267da70ea8c36caaa645a3c4f1c5f0ca8bae156a] | committer: Carl Eugen Hoyos
lavf/utils: Avoid an overflow for huge negative durations. Fixes ticket #5135. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=267da70ea8c36caaa645a3c4f1c5f0ca8bae156a --- libavformat/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index 93ea6ff..3e0f57d 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2547,7 +2547,7 @@ static void update_stream_timings(AVFormatContext *ic) end_time1 = av_rescale_q_rnd(st->duration, st->time_base, AV_TIME_BASE_Q, AV_ROUND_NEAR_INF|AV_ROUND_PASS_MINMAX); - if (end_time1 != AV_NOPTS_VALUE && start_time1 <= INT64_MAX - end_time1) { + if (end_time1 != AV_NOPTS_VALUE && (end_time1 > 0 ? start_time1 <= INT64_MAX - end_time1 : start_time1 >= INT64_MIN - end_time1)) { end_time1 += start_time1; end_time = FFMAX(end_time, end_time1); } _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
