aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukasz Marek <lukasz.m.luki2@gmail.com>2014-04-30 00:00:44 +0200
committerLukasz Marek <lukasz.m.luki2@gmail.com>2014-05-02 18:04:05 +0200
commit330d547ef3cceb0a90b4db3bb0ea58d07dabe4d4 (patch)
tree38e35713fe24f0da5f1c8b3e253f38d4ff9400f4
parentba52fb11dc6305ec2ded10ad172ebb28e6583038 (diff)
downloadffmpeg-330d547ef3cceb0a90b4db3bb0ea58d07dabe4d4.tar.gz
lavf/mux: pass options to nested structs of priv data
This commit allows to benefit from implementing child_next callback for muxers' AVClasses. Without that, options cannot be set in nested structs. Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
-rw-r--r--libavformat/mux.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/mux.c b/libavformat/mux.c
index 6847ec342b..7b4f7c77d3 100644
--- a/libavformat/mux.c
+++ b/libavformat/mux.c
@@ -334,7 +334,7 @@ static int init_muxer(AVFormatContext *s, AVDictionary **options)
if (of->priv_class) {
*(const AVClass **)s->priv_data = of->priv_class;
av_opt_set_defaults(s->priv_data);
- if ((ret = av_opt_set_dict(s->priv_data, &tmp)) < 0)
+ if ((ret = av_opt_set_dict2(s->priv_data, &tmp, AV_OPT_SEARCH_CHILDREN)) < 0)
goto fail;
}
}