[FFmpeg-cvslog] avfilter: fix handing of child context options

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Apr 11 20:22:54 2013 +0200| [f6bfeef7faf9edd82305ec287b44f118f565a56a] | committer: Michael Niedermayer

avfilter: fix handing of child context options

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f6bfeef7faf9edd82305ec287b44f118f565a56a
---

 libavfilter/avfilter.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index 1af15ca..3290402 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);