Browse Source

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>
tags/n2.3
Lukasz Marek Michael Niedermayer 11 years ago
parent
commit
c9a12fdd2d
1 changed files with 1 additions and 1 deletions
  1. +1
    -1
      libavformat/mux.c

+ 1
- 1
libavformat/mux.c View File

@@ -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


Loading…
Cancel
Save