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/flacenc.h | |
| parent | 855e3b5700fff78bf20f900daade58396b73846d (diff) | |
| parent | e19d48dfce52f1417f7f06143b96fed00cbcdc52 (diff) | |
| download | ffmpeg-955b31a7513e924cce36e484dc098581290af9b6.tar.gz | |
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/flacenc.h')
| -rw-r--r-- | libavformat/flacenc.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/flacenc.h b/libavformat/flacenc.h index 2e9ee37766..d5d53a5dcb 100644 --- a/libavformat/flacenc.h +++ b/libavformat/flacenc.h @@ -26,8 +26,8 @@ #include "libavcodec/bytestream.h" #include "avformat.h" -int ff_flac_write_header(AVIOContext *pb, AVCodecContext *codec, - int last_block); +int ff_flac_write_header(AVIOContext *pb, uint8_t *extradata, + int extradata_size, int last_block); int ff_flac_is_native_layout(uint64_t channel_layout); |