From c9a12fdd2d29917b088fa2f593abd51926ead46b Mon Sep 17 00:00:00 2001 From: Lukasz Marek Date: Sun, 4 May 2014 07:11:50 +0200 Subject: lavf/mux: pass options to nested structs of priv data This is continuation of commit 330d547e Nested struct is set in two places. Previous commit set nested struct only in one case. Signed-off-by: Lukasz Marek Signed-off-by: Michael Niedermayer --- libavformat/mux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libavformat/mux.c') diff --git a/libavformat/mux.c b/libavformat/mux.c index 7b4f7c77d3..cbe17f5d78 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -232,7 +232,7 @@ static int init_muxer(AVFormatContext *s, AVDictionary **options) if ((ret = av_opt_set_dict(s, &tmp)) < 0) goto fail; if (s->priv_data && s->oformat->priv_class && *(const AVClass**)s->priv_data==s->oformat->priv_class && - (ret = av_opt_set_dict(s->priv_data, &tmp)) < 0) + (ret = av_opt_set_dict2(s->priv_data, &tmp, AV_OPT_SEARCH_CHILDREN)) < 0) goto fail; // some sanity checks -- cgit v1.2.3