diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2019-09-16 17:55:01 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2020-07-03 00:02:25 +0200 |
| commit | 00e52eff6553c4eb8cd8ae91954552936123d51c (patch) | |
| tree | 8d8e5040802a6f3af1f08c7f3612107a8ad0487c | |
| parent | d925a11a80638d95abee0d290312a6beb943a001 (diff) | |
| download | ffmpeg-00e52eff6553c4eb8cd8ae91954552936123d51c.tar.gz | |
fftools/ffmpeg_opt: Fix signed integer overflow
Fixes ticket #8154.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 2b1fcba8ddcb7d29299ea28403fb597640a7288b)
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
| -rw-r--r-- | fftools/ffmpeg_opt.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index 9bce6fd4aa..dcfaa06926 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -1,3 +1,4 @@ + /* * ffmpeg option parsing * @@ -2777,13 +2778,14 @@ static int opt_target(void *optctx, const char *opt, const char *arg) } else { /* Try to determine PAL/NTSC by peeking in the input files */ if (nb_input_files) { - int i, j, fr; + int i, j; for (j = 0; j < nb_input_files; j++) { for (i = 0; i < input_files[j]->nb_streams; i++) { AVStream *st = input_files[j]->ctx->streams[i]; + int64_t fr; if (st->codecpar->codec_type != AVMEDIA_TYPE_VIDEO) continue; - fr = st->time_base.den * 1000 / st->time_base.num; + fr = st->time_base.den * 1000LL / st->time_base.num; if (fr == 25000) { norm = PAL; break; |