From 98db90589651474366a32e14e3ad062ef3ca6707 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Wed, 2 Jan 2013 22:01:41 +0100 Subject: [PATCH] avformat_seek_file: Dont attempt to rescale INT64_MIN/MAX MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes a integer overflow in fate Reviewed-by: Clément Bœsch Signed-off-by: Michael Niedermayer --- libavformat/utils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index cbf32638c3..096bb82713 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2092,10 +2092,10 @@ int avformat_seek_file(AVFormatContext *s, int stream_index, int64_t min_ts, int ts = av_rescale_q(ts, AV_TIME_BASE_Q, time_base); min_ts = av_rescale_rnd(min_ts, time_base.den, time_base.num * (int64_t)AV_TIME_BASE, - AV_ROUND_UP); + AV_ROUND_UP | AV_ROUND_PASS_MINMAX); max_ts = av_rescale_rnd(max_ts, time_base.den, time_base.num * (int64_t)AV_TIME_BASE, - AV_ROUND_DOWN); + AV_ROUND_DOWN | AV_ROUND_PASS_MINMAX); } ret = s->iformat->read_seek2(s, stream_index, min_ts, ts, max_ts, flags);