diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-07-25 22:25:24 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-07-25 22:38:13 +0200 |
| commit | 2962049ac318c1577c15e934a50b64572b2e877c (patch) | |
| tree | 39dbf4e3dff75069c8896be0d70d1c580fc74fd6 | |
| parent | 981f6fc988dc33e81566fdaf4087da3cfa3ddb04 (diff) | |
| download | ffmpeg-2962049ac318c1577c15e934a50b64572b2e877c.tar.gz | |
muxer opts: fix avdict use in case of early private context alloc
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/utils.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 44ecd0a47f..38407b9d4b 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2929,6 +2929,9 @@ int avformat_write_header(AVFormatContext *s, AVDictionary **options) av_dict_copy(&tmp, *options, 0); 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) + goto fail; // some sanity checks if (s->nb_streams == 0 && !(s->oformat->flags & AVFMT_NOSTREAMS)) { |