diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-30 20:34:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-30 20:34:13 +0200 |
| commit | 9dc112e277fd67e05044b34ce9fb3177905f2db5 (patch) | |
| tree | f366d0692e1e38475cee0dcb261090b209c8d325 | |
| parent | 75ff0e8c50d12c40170a21479ac07f573952cdf2 (diff) | |
| parent | b20a8ad619ac0e2631391b6311cc000de85d22bf (diff) | |
| download | ffmpeg-9dc112e277fd67e05044b34ce9fb3177905f2db5.tar.gz | |
Merge commit 'b20a8ad619ac0e2631391b6311cc000de85d22bf' into release/2.2
* commit 'b20a8ad619ac0e2631391b6311cc000de85d22bf':
video4linux2: Avoid a floating point exception
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | ffmpeg_opt.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c index ba2df02e47..3d50d7708b 100644 --- a/ffmpeg_opt.c +++ b/ffmpeg_opt.c @@ -2119,7 +2119,8 @@ static int opt_target(void *optctx, const char *opt, const char *arg) for (j = 0; j < nb_input_files; j++) { for (i = 0; i < input_files[j]->nb_streams; i++) { AVCodecContext *c = input_files[j]->ctx->streams[i]->codec; - if (c->codec_type != AVMEDIA_TYPE_VIDEO) + if (c->codec_type != AVMEDIA_TYPE_VIDEO || + !c->time_base.num) continue; fr = c->time_base.den * 1000 / c->time_base.num; if (fr == 25000) { |