diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2010-03-23 23:58:45 +0000 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2010-03-23 23:58:45 +0000 |
| commit | 06ebe9161e93c36af3faa0e852a3358cca4a2bc7 (patch) | |
| tree | 63814155a6200e2a25158619c2d316878ac716d2 /libavformat/flacenc.h | |
| parent | 85f273c7ca7e0035054fa55f98bd06c551f518b0 (diff) | |
| download | ffmpeg-06ebe9161e93c36af3faa0e852a3358cca4a2bc7.tar.gz | |
Put ff_flac_write_header() in a separate C file to allow it to be shared without
duplicating code or adding a dependency on vorbiscomment.o.
Originally committed as revision 22652 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/flacenc.h')
| -rw-r--r-- | libavformat/flacenc.h | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/libavformat/flacenc.h b/libavformat/flacenc.h index 471376692a..8ad1c267ab 100644 --- a/libavformat/flacenc.h +++ b/libavformat/flacenc.h @@ -26,28 +26,7 @@ #include "libavcodec/bytestream.h" #include "avformat.h" -static int ff_flac_write_header(ByteIOContext *pb, AVCodecContext *codec, - int last_block) -{ - uint8_t header[8] = { - 0x66, 0x4C, 0x61, 0x43, 0x00, 0x00, 0x00, 0x22 - }; - uint8_t *streaminfo; - enum FLACExtradataFormat format; - - header[4] = last_block ? 0x80 : 0x00; - if (!ff_flac_is_extradata_valid(codec, &format, &streaminfo)) - return -1; - - /* write "fLaC" stream marker and first metadata block header if needed */ - if (format == FLAC_EXTRADATA_FORMAT_STREAMINFO) { - put_buffer(pb, header, 8); - } - - /* write STREAMINFO or full header */ - put_buffer(pb, codec->extradata, codec->extradata_size); - - return 0; -} +int ff_flac_write_header(ByteIOContext *pb, AVCodecContext *codec, + int last_block); #endif /* AVFORMAT_FLACENC_H */ |