projects
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b4d308c
)
avformat/mov: fix avg_frame_rate calculation
author
Michael Niedermayer
<michaelni@gmx.at>
Sun, 16 Feb 2014 18:05:49 +0000
(19:05 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sun, 16 Feb 2014 18:05:49 +0000
(19:05 +0100)
Fixes integer overflow
Fixes Ticket3390
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/mov.c
patch
|
blob
|
history
diff --git
a/libavformat/mov.c
b/libavformat/mov.c
index
85f5f83
..
834969a
100644
(file)
--- a/
libavformat/mov.c
+++ b/
libavformat/mov.c
@@
-3419,7
+3419,7
@@
static int mov_read_header(AVFormatContext *s)
}
if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO && sc->nb_frames_for_fps > 0 && sc->duration_for_fps > 0)
av_reduce(&st->avg_frame_rate.num, &st->avg_frame_rate.den,
- sc->time_scale*sc->nb_frames_for_fps, sc->duration_for_fps, INT_MAX);
+ sc->time_scale*
(int64_t)
sc->nb_frames_for_fps, sc->duration_for_fps, INT_MAX);
}
if (mov->trex_data) {