[Ffmpeg-cvslog] CVS: ffmpeg/libavformat raw.c,1.65,1.66

[Måns Rullgård CVS]

Update of /cvsroot/ffmpeg/ffmpeg/libavformat
In directory mail:/var2/tmp/cvs-serv5778

Modified Files:
	raw.c 
Log Message:
read/write adts aac


Index: raw.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/raw.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- raw.c	4 Feb 2006 16:57:58 -0000	1.65
+++ raw.c	8 Feb 2006 00:51:55 -0000	1.66
@@ -256,6 +256,23 @@
     return 0;
 }
 
+/* aac read */
+static int aac_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_AAC;
+    st->need_parsing = 1;
+    /* the parameters will be extracted from the compressed bitstream */
+    return 0;
+}
+
 /* mpeg1/h263 input */
 static int video_read_header(AVFormatContext *s,
                              AVFormatParameters *ap)
@@ -389,6 +406,32 @@
     .extensions = "dts",
 };
 
+AVInputFormat aac_iformat = {
+    "aac",
+    "ADTS AAC",
+    0,
+    NULL,
+    aac_read_header,
+    raw_read_partial_packet,
+    raw_read_close,
+    .extensions = "aac",
+};
+
+#ifdef CONFIG_MUXERS
+AVOutputFormat aac_oformat = {
+    "aac",
+    "ADTS AAC",
+    "audio/aac",
+    "aac",
+    0,
+    CODEC_ID_AAC,
+    0,
+    raw_write_header,
+    raw_write_packet,
+    raw_write_trailer,
+};
+#endif
+
 AVInputFormat h261_iformat = {
     "h261",
     "raw h261",
@@ -739,6 +782,9 @@
     av_register_input_format(&ac3_iformat);
     av_register_output_format(&ac3_oformat);
 
+    av_register_input_format(&aac_iformat);
+    av_register_output_format(&aac_oformat);
+
     av_register_input_format(&dts_iformat);
 
     av_register_input_format(&h261_iformat);