[FFmpeg-devel] [PATCH]lavf/utils: Avoid an overflow for huge negative durations.
Carl Eugen Hoyos
cehoyos at ag.or.at
Sat Sep 24 14:10:35 EEST 2016
Hi!
Attached patch hopefully fixes ticket #5135.
Please review, Carl Eugen
-------------- next part --------------
From 12a33bb9d5475701009a60af79fa7699416b50e7 Mon Sep 17 00:00:00 2001
From: Carl Eugen Hoyos <cehoyos at ag.or.at>
Date: Sat, 24 Sep 2016 13:07:39 +0200
Subject: [PATCH] lavf/utils: Avoid an overflow for huge negative durations.
Fixes ticket #5135.
---
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);
}
--
1.7.10.4
More information about the ffmpeg-devel
mailing list