DCA decoder

Originally committed as revision 8141 to svn://svn.ffmpeg.org/ffmpeg/trunk
mbouron · Feb 27, 2007 · 01ca9ac · 01ca9ac
1 parent e7ebecb
commit 01ca9ac
Show file tree

Hide file tree

Showing 8 changed files with 10,852 additions and 2 deletions.
diff --git a/Changelog b/Changelog
@@ -72,6 +72,7 @@ version <next>
 - BMP encoder
 - WMA encoder
 - GSM-MS encoder and decoder
+- DCA decoder
 
 version 0.4.9-pre1:
 

diff --git a/doc/ffmpeg-doc.texi b/doc/ffmpeg-doc.texi
@@ -1082,6 +1082,7 @@ following image formats are supported:
 @item Intel Music Coder      @tab      @tab X
 @item Musepack               @tab      @tab X
 @tab Only SV7 is supported
+@item DT$ Coherent Audio     @tab      @tab X
 @end multitable
 
 @code{X} means that encoding (resp. decoding) is supported.

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
@@ -63,6 +63,7 @@ OBJS-$(CONFIG_CLJR_ENCODER)            += cljr.o
 OBJS-$(CONFIG_COOK_DECODER)            += cook.o
 OBJS-$(CONFIG_CSCD_DECODER)            += cscd.o
 OBJS-$(CONFIG_CYUV_DECODER)            += cyuv.o
+OBJS-$(CONFIG_DCA_DECODER)             += dca.o
 OBJS-$(CONFIG_DSICINVIDEO_DECODER)     += dsicinav.o
 OBJS-$(CONFIG_DSICINAUDIO_DECODER)     += dsicinav.o
 OBJS-$(CONFIG_DVBSUB_DECODER)          += dvbsubdec.o

diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
@@ -64,6 +64,7 @@ void avcodec_register_all(void)
     REGISTER_DECODER(CLJR, cljr);
     REGISTER_DECODER(CSCD, cscd);
     REGISTER_DECODER(CYUV, cyuv);
+    REGISTER_DECODER(DCA, dca);
     REGISTER_DECODER(DSICINVIDEO, dsicinvideo);
     REGISTER_ENCDEC (DVVIDEO, dvvideo);
     REGISTER_DECODER(EIGHTBPS, eightbps);
@@ -249,6 +250,7 @@ void avcodec_register_all(void)
     REGISTER_PARSER (AAC, aac);
     REGISTER_PARSER (AC3, ac3);
     REGISTER_PARSER (CAVSVIDEO, cavsvideo);
+    REGISTER_PARSER (DCA, dca);
     REGISTER_PARSER (DVBSUB, dvbsub);
     REGISTER_PARSER (DVDSUB, dvdsub);
     REGISTER_PARSER (H261, h261);

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
@@ -37,8 +37,8 @@ extern "C" {
 #define AV_STRINGIFY(s)         AV_TOSTRING(s)
 #define AV_TOSTRING(s) #s
 
-#define LIBAVCODEC_VERSION_INT  ((51<<16)+(34<<8)+0)
-#define LIBAVCODEC_VERSION      51.34.0
+#define LIBAVCODEC_VERSION_INT  ((51<<16)+(35<<8)+0)
+#define LIBAVCODEC_VERSION      51.35.0
 #define LIBAVCODEC_BUILD        LIBAVCODEC_VERSION_INT
 
 #define LIBAVCODEC_IDENT        "Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION)
@@ -2219,6 +2219,7 @@ extern AVCodec cljr_decoder;
 extern AVCodec cook_decoder;
 extern AVCodec cscd_decoder;
 extern AVCodec cyuv_decoder;
+extern AVCodec dca_decoder;
 extern AVCodec dsicinaudio_decoder;
 extern AVCodec dsicinvideo_decoder;
 extern AVCodec dvvideo_decoder;
@@ -2883,6 +2884,7 @@ void av_parser_close(AVCodecParserContext *s);
 extern AVCodecParser aac_parser;
 extern AVCodecParser ac3_parser;
 extern AVCodecParser cavsvideo_parser;
+extern AVCodecParser dca_parser;
 extern AVCodecParser dvbsub_parser;
 extern AVCodecParser dvdsub_parser;
 extern AVCodecParser h261_parser;