diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-01 14:16:29 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-01 14:16:29 +0200 |
commit | 955b31a7513e924cce36e484dc098581290af9b6 (patch) | |
tree | f063480e25161f2038c50e9106c0a9666beebb50 /libavformat/matroskaenc.c | |
parent | 855e3b5700fff78bf20f900daade58396b73846d (diff) | |
parent | e19d48dfce52f1417f7f06143b96fed00cbcdc52 (diff) |
Merge commit 'e19d48dfce52f1417f7f06143b96fed00cbcdc52'
* commit 'e19d48dfce52f1417f7f06143b96fed00cbcdc52':
flac muxer: support reading updated extradata from side data
Conflicts:
libavformat/flacenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/matroskaenc.c')
-rw-r--r-- | libavformat/matroskaenc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index fb26d9535b..3f88346e2e 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -514,7 +514,8 @@ static int put_flac_codecpriv(AVFormatContext *s, int write_comment = (codec->channel_layout && !(codec->channel_layout & ~0x3ffffULL) && !ff_flac_is_native_layout(codec->channel_layout)); - int ret = ff_flac_write_header(pb, codec, !write_comment); + int ret = ff_flac_write_header(pb, codec->extradata, codec->extradata_size, + !write_comment); if (ret < 0) return ret; |