Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-07-12 04:11:02 +0400
committerMichael Niedermayer <michaelni@gmx.at>2014-07-12 04:23:48 +0400
commit59975de77741766df4cc48c66bc151a6c31f9291 (patch)
tree28f4bef954c991566d88f21b106e222979b420b2 /ffmpeg.c
parent2cebd17e3f87c4f5706ccbb5613c658b5f39609a (diff)
ffmpeg: fix integer overflows with sub->*display_time
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 15f2c24228..5a47510b50 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -232,9 +232,9 @@ static void sub2video_update(InputStream *ist, AVSubtitle *sub)
if (!frame)
return;
if (sub) {
- pts = av_rescale_q(sub->pts + sub->start_display_time * 1000,
+ pts = av_rescale_q(sub->pts + sub->start_display_time * 1000LL,
AV_TIME_BASE_Q, ist->st->time_base);
- end_pts = av_rescale_q(sub->pts + sub->end_display_time * 1000,
+ end_pts = av_rescale_q(sub->pts + sub->end_display_time * 1000LL,
AV_TIME_BASE_Q, ist->st->time_base);
num_rects = sub->num_rects;
} else {