Mercurial > libavformat.hg
diff raw.c @ 4577:1cc2041c2e03 libavformat
Separate the raw FLAC muxer from raw.c to its own file, flacenc.c.
author | jbr |
---|---|
date | Thu, 26 Feb 2009 02:21:43 +0000 |
parents | 90e0047f90b6 |
children | 41542d2edcf4 |
line wrap: on
line diff
--- a/raw.c Wed Feb 25 19:10:39 2009 +0000 +++ b/raw.c Thu Feb 26 02:21:43 2009 +0000 @@ -29,38 +29,6 @@ #include "id3v2.h" /* simple formats */ -#if CONFIG_FLAC_MUXER -static int flac_write_header(struct AVFormatContext *s) -{ - static const uint8_t header[8] = { - 0x66, 0x4C, 0x61, 0x43, 0x80, 0x00, 0x00, 0x22 - }; - uint8_t *streaminfo = s->streams[0]->codec->extradata; - int len = s->streams[0]->codec->extradata_size; - if(streaminfo != NULL && len > 0) { - put_buffer(s->pb, header, 8); - put_buffer(s->pb, streaminfo, len); - } - return 0; -} - -static int flac_write_trailer(struct AVFormatContext *s) -{ - ByteIOContext *pb = s->pb; - uint8_t *streaminfo = s->streams[0]->codec->extradata; - int len = s->streams[0]->codec->extradata_size; - int64_t file_size; - - if (streaminfo && len > 0 && !url_is_streamed(s->pb)) { - file_size = url_ftell(pb); - url_fseek(pb, 8, SEEK_SET); - put_buffer(pb, streaminfo, len); - url_fseek(pb, file_size, SEEK_SET); - put_flush_packet(pb); - } - return 0; -} -#endif #if CONFIG_ROQ_MUXER static int roq_write_header(struct AVFormatContext *s) @@ -851,22 +819,6 @@ }; #endif -#if CONFIG_FLAC_MUXER -AVOutputFormat flac_muxer = { - "flac", - NULL_IF_CONFIG_SMALL("raw FLAC"), - "audio/x-flac", - "flac", - 0, - CODEC_ID_FLAC, - CODEC_ID_NONE, - flac_write_header, - raw_write_packet, - flac_write_trailer, - .flags= AVFMT_NOTIMESTAMPS, -}; -#endif - #if CONFIG_GSM_DEMUXER AVInputFormat gsm_demuxer = { "gsm",