diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2010-03-22 21:58:38 +0000 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2010-03-22 21:58:38 +0000 |
| commit | 19de452a630f0906ef3ebda4f27ca7b2a4b59f07 (patch) | |
| tree | b2a3298947df1adf7bf752f4a030e4ccf5b3f7a4 | |
| parent | ef768b0c326cc9a6208b5021e648edb33188e503 (diff) | |
| download | ffmpeg-19de452a630f0906ef3ebda4f27ca7b2a4b59f07.tar.gz | |
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
| -rw-r--r-- | libavformat/Makefile | 2 | ||||
| -rw-r--r-- | libavformat/flacenc.c | 23 | ||||
| -rw-r--r-- | libavformat/flacenc.h | 27 |
3 files changed, 26 insertions, 26 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index 39ac96ce04..c244ceec94 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -103,7 +103,7 @@ OBJS-$(CONFIG_M4V_MUXER) += raw.o OBJS-$(CONFIG_MATROSKA_DEMUXER) += matroskadec.o matroska.o \ riff.o isom.o rmdec.o rm.o OBJS-$(CONFIG_MATROSKA_MUXER) += matroskaenc.o matroska.o \ - riff.o isom.o avc.o flacenc.o + riff.o isom.o avc.o OBJS-$(CONFIG_MJPEG_DEMUXER) += raw.o OBJS-$(CONFIG_MJPEG_MUXER) += raw.o OBJS-$(CONFIG_MLP_DEMUXER) += raw.o id3v2.o 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) diff --git a/libavformat/flacenc.h b/libavformat/flacenc.h index 748c68ea89..471376692a 100644 --- a/libavformat/flacenc.h +++ b/libavformat/flacenc.h @@ -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 */ |