diff options
| author | Lukasz Marek <lukasz.m.luki2@gmail.com> | 2014-05-04 07:11:50 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-04 14:46:37 +0200 |
| commit | c9a12fdd2d29917b088fa2f593abd51926ead46b (patch) | |
| tree | 66a2b71e21d0706a7ba9327b61b2a2b12debdc37 /libavformat/mux.c | |
| parent | 336901e0601ed8067018e1c51c53b5114b887cf2 (diff) | |
| download | ffmpeg-c9a12fdd2d29917b088fa2f593abd51926ead46b.tar.gz | |
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@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mux.c')
| -rw-r--r-- | libavformat/mux.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 |