From 19de452a630f0906ef3ebda4f27ca7b2a4b59f07 Mon Sep 17 00:00:00 2001 From: Justin Ruggles Date: Mon, 22 Mar 2010 21:58:38 +0000 Subject: 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. Originally committed as revision 22639 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/flacenc.c | 23 ----------------------- 1 file changed, 23 deletions(-) (limited to 'libavformat/flacenc.c') diff --git a/libavformat/flacenc.c b/libavformat/flacenc.c index ff90731d8e..91a080f3a3 100644 --- a/libavformat/flacenc.c +++ b/libavformat/flacenc.c @@ -26,29 +26,6 @@ #include "vorbiscomment.h" #include "libavcodec/bytestream.h" -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; -} static int flac_write_block_padding(ByteIOContext *pb, unsigned int n_padding_bytes, int last_block) -- cgit v1.2.3