diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-29 00:01:25 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-29 00:06:32 +0200 |
| commit | 25a20608909fbdc3c58981aaaee31e728e8cd196 (patch) | |
| tree | c5bbf2beecc55b2f8013db90ac24429801742cea /ffmpeg_opt.c | |
| parent | 63c0b41904bc6e603b61b7f11520db85a3e44113 (diff) | |
| parent | dc71f1958846bb1d96de43a4603983dc8450cfcc (diff) | |
| download | ffmpeg-25a20608909fbdc3c58981aaaee31e728e8cd196.tar.gz | |
Merge commit 'dc71f1958846bb1d96de43a4603983dc8450cfcc'
* commit 'dc71f1958846bb1d96de43a4603983dc8450cfcc':
video4linux2: Avoid a floating point exception
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_opt.c')
| -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 ab13d3cf16..2adefc5ca5 100644 --- a/ffmpeg_opt.c +++ b/ffmpeg_opt.c @@ -2166,7 +2166,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) { |