[FFmpeg-cvslog] lavf/mux: pass options to nested structs of priv data

[Lukasz Marek]

ffmpeg | branch: master | Lukasz Marek <lukasz.m.luki2 at gmail.com> | Sun May  4 07:11:50 2014 +0200| [c9a12fdd2d29917b088fa2f593abd51926ead46b] | committer: Michael Niedermayer

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 <lukasz.m.luki2 at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavformat/mux.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/mux.c b/libavformat/mux.c
index 7b4f7c7..cbe17f5 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