diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 20:22:54 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 20:40:30 +0200 |
| commit | f6bfeef7faf9edd82305ec287b44f118f565a56a (patch) | |
| tree | 2119b090240cd7b9a3f19f1a6897044d04a608dd /libavfilter/avfilter.c | |
| parent | c1907bd732c026ad5b9464d3fd41ae7ebad0ee59 (diff) | |
| download | ffmpeg-f6bfeef7faf9edd82305ec287b44f118f565a56a.tar.gz | |
avfilter: fix handing of child context options
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/avfilter.c')
| -rw-r--r-- | libavfilter/avfilter.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 1af15ca3f7..3290402358 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -656,11 +656,13 @@ static int process_options(AVFilterContext *ctx, AVDictionary **options, av_log(ctx, AV_LOG_DEBUG, "Setting '%s' to value '%s'\n", key, value); av_dict_set(options, key, value, 0); if ((ret = av_opt_set(ctx->priv, key, value, 0)) < 0) { + if (!av_opt_find(ctx->priv, key, NULL, 0, AV_OPT_SEARCH_CHILDREN | AV_OPT_SEARCH_FAKE_OBJ)) { if (ret == AVERROR_OPTION_NOT_FOUND) av_log(ctx, AV_LOG_ERROR, "Option '%s' not found\n", key); av_free(value); av_free(parsed_key); return ret; + } } av_free(value); |