Mercurial > libavformat.hg
diff flacenc.h @ 5868:92daebc423f4 libavformat
Move ff_flac_write_header() to flacenc.h, which removes the Matroska muxer's
dependency on flacenc.o and fixes the unnecessary dependency on vorbiscomment.o.
author | jbr |
---|---|
date | Mon, 22 Mar 2010 21:58:38 +0000 |
parents | 121d6994c20e |
children | e3fb53259d86 |
line wrap: on
line diff
--- a/flacenc.h Mon Mar 22 20:18:42 2010 +0000 +++ b/flacenc.h Mon Mar 22 21:58:38 2010 +0000 @@ -22,9 +22,32 @@ #ifndef AVFORMAT_FLACENC_H #define AVFORMAT_FLACENC_H +#include "libavcodec/flac.h" +#include "libavcodec/bytestream.h" #include "avformat.h" -int ff_flac_write_header(ByteIOContext *pb, AVCodecContext *codec, - int last_block); +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; +} #endif /* AVFORMAT_FLACENC_H */