Browse Source

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 2b1fcba8dd)
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
tags/n3.4.8
Andreas Rheinhardt 5 years ago
parent
commit
00e52eff65
1 changed files with 4 additions and 2 deletions
  1. +4
    -2
      fftools/ffmpeg_opt.c

+ 4
- 2
fftools/ffmpeg_opt.c View File

@@ -1,3 +1,4 @@

/* /*
* ffmpeg option parsing * ffmpeg option parsing
* *
@@ -2777,13 +2778,14 @@ static int opt_target(void *optctx, const char *opt, const char *arg)
} else { } else {
/* Try to determine PAL/NTSC by peeking in the input files */ /* Try to determine PAL/NTSC by peeking in the input files */
if (nb_input_files) { if (nb_input_files) {
int i, j, fr;
int i, j;
for (j = 0; j < nb_input_files; j++) { for (j = 0; j < nb_input_files; j++) {
for (i = 0; i < input_files[j]->nb_streams; i++) { for (i = 0; i < input_files[j]->nb_streams; i++) {
AVStream *st = input_files[j]->ctx->streams[i]; AVStream *st = input_files[j]->ctx->streams[i];
int64_t fr;
if (st->codecpar->codec_type != AVMEDIA_TYPE_VIDEO) if (st->codecpar->codec_type != AVMEDIA_TYPE_VIDEO)
continue; continue;
fr = st->time_base.den * 1000 / st->time_base.num;
fr = st->time_base.den * 1000LL / st->time_base.num;
if (fr == 25000) { if (fr == 25000) {
norm = PAL; norm = PAL;
break; break;


Loading…
Cancel
Save