[Ffmpeg-cvslog] CVS: ffmpeg/libavformat raw.c,1.69,1.70
Benjamin Larsson CVS
banan
Tue May 9 14:34:38 CEST 2006
Update of /cvsroot/ffmpeg/ffmpeg/libavformat
In directory mail:/var2/tmp/cvs-serv23354/libavformat
Modified Files:
raw.c
Log Message:
Add support for raw flac decoding based on the .flac suffix of input files.
Index: raw.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/raw.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- raw.c 11 Mar 2006 00:22:21 -0000 1.69
+++ raw.c 9 May 2006 12:34:35 -0000 1.70
@@ -236,6 +236,22 @@
return 0;
}
+/* flac read */
+static int flac_read_header(AVFormatContext *s,
+ AVFormatParameters *ap)
+{
+ AVStream *st;
+
+ st = av_new_stream(s, 0);
+ if (!st)
+ return AVERROR_NOMEM;
+ st->codec->codec_type = CODEC_TYPE_AUDIO;
+ st->codec->codec_id = CODEC_ID_FLAC;
+ st->need_parsing = 1;
+ /* the parameters will be extracted from the compressed bitstream */
+ return 0;
+}
+
/* dts read */
static int dts_read_header(AVFormatContext *s,
AVFormatParameters *ap)
@@ -370,6 +386,17 @@
.extensions = "shn",
};
+AVInputFormat flac_iformat = {
+ "flac",
+ "raw flac",
+ 0,
+ NULL,
+ flac_read_header,
+ raw_read_partial_packet,
+ raw_read_close,
+ .extensions = "flac",
+};
+
AVInputFormat ac3_iformat = {
"ac3",
"raw ac3",
@@ -764,6 +791,7 @@
{
av_register_input_format(&shorten_iformat);
+ av_register_input_format(&flac_iformat);
av_register_input_format(&ac3_iformat);
av_register_output_format(&ac3_oformat);
More information about the ffmpeg-cvslog
mailing list