diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-03 02:16:35 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-03 02:24:27 +0100 |
| commit | 8a1714ad85dd5defdf1fb2baba9ababebfa47d01 (patch) | |
| tree | b4dde660d77fbf6c1eaf641dc69018ab69d1ff44 /ffmpeg_opt.c | |
| parent | 4feca2214a0b69dcbe4d1c7cd145c3881459e867 (diff) | |
| download | ffmpeg-8a1714ad85dd5defdf1fb2baba9ababebfa47d01.tar.gz | |
ffmpeg: do not fail when options are routed to libavformat and libavcodec and only one can be used
Fixes setting frame_size for pulse demuxer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_opt.c')
| -rw-r--r-- | ffmpeg_opt.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c index d267c6d4e5..4e0dc478e6 100644 --- a/ffmpeg_opt.c +++ b/ffmpeg_opt.c @@ -915,8 +915,13 @@ static int open_input_file(OptionsContext *o, const char *filename) const AVClass *class = avcodec_get_class(); const AVOption *option = av_opt_find(&class, e->key, NULL, 0, AV_OPT_SEARCH_CHILDREN | AV_OPT_SEARCH_FAKE_OBJ); - if (!option) + const AVClass *fclass = avformat_get_class(); + const AVOption *foption = av_opt_find(&fclass, e->key, NULL, 0, + AV_OPT_SEARCH_CHILDREN | AV_OPT_SEARCH_FAKE_OBJ); + if (!option || foption) continue; + + if (!(option->flags & AV_OPT_FLAG_DECODING_PARAM)) { av_log(NULL, AV_LOG_ERROR, "Codec AVOption %s (%s) specified for " "input file #%d (%s) is not a decoding option.\n", e->key, |