generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Separate the raw FLAC muxer from raw.c to its own file, flacenc.c.

Browse Source 
Originally committed as revision 17601 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Justin Ruggles
2009-02-26 02:21:43 +00:00
parent e8d5c07bcc
commit caee91f7d0
3 changed files with 75 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
libavformat/raw.c
View File

@@ -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 @@ AVInputFormat flac_demuxer = {
};
#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",