From 5590ab45e0b1cd45e48580608f99615ad0a429b8 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Thu, 18 Feb 2016 01:07:33 +0100 Subject: [PATCH] ffmpeg: Check best_effort_timestamp after rescale Fixes integer overflow Fixes: Ticket5126 Signed-off-by: Michael Niedermayer --- ffmpeg.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ffmpeg.c b/ffmpeg.c index a5ec3c3833..c20f75a16d 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -2123,8 +2123,12 @@ static int decode_video(InputStream *ist, AVPacket *pkt, int *got_output) ist->hwaccel_retrieved_pix_fmt = decoded_frame->format; best_effort_timestamp= av_frame_get_best_effort_timestamp(decoded_frame); - if(best_effort_timestamp != AV_NOPTS_VALUE) - ist->next_pts = ist->pts = av_rescale_q(decoded_frame->pts = best_effort_timestamp, ist->st->time_base, AV_TIME_BASE_Q); + if(best_effort_timestamp != AV_NOPTS_VALUE) { + int64_t ts = av_rescale_q(decoded_frame->pts = best_effort_timestamp, ist->st->time_base, AV_TIME_BASE_Q); + + if (ts != AV_NOPTS_VALUE) + ist->next_pts = ist->pts = ts; + } if (debug_ts) { av_log(NULL, AV_LOG_INFO, "decoder -> ist_index:%d type:video "