Hook up the MD studio demuxer and Atrac1 decoder.

Originally committed as revision 19969 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/Changelog b/Changelog
index 65e71cfe8b0f1bddd6f785ca37b50371496f538b..b2a65c6d135ae298dba196789bc81a37238776b1 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -38,6 +38,8 @@ version <next>:
 - LPCM support in MPEG-TS (HDMV RID as found on Blu-ray disks)
 - Wmapro decoder
 - Core Audio Format demuxer
+- Atrac1 decoder
+- MD STUDIO audio demuxer
 
 
 

diff --git a/doc/general.texi b/doc/general.texi
index d0d472e6d5279b3c50ecec2e66b9f944b6646f2b..dc8620750a653b44a127234aa02fe2adad3e26c1 100644 (file)
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -107,6 +107,7 @@ library:
 @item Matroska audio            @tab X @tab
 @item MAXIS XA                  @tab   @tab X
     @tab Used in Sim City 3000; file extension .xa.
+@item MD Studio                 @tab   @tab X
 @item Monkey's Audio            @tab   @tab X
 @item Motion Pixels MVI         @tab   @tab X
 @item MOV/QuickTime/MP4         @tab X @tab X
@@ -532,6 +533,7 @@ following image formats are supported:
     @tab decoding supported through external library libopencore-amrwb
 @item Apple lossless audio   @tab  X  @tab  X
     @tab QuickTime fourcc 'alac'
+@item Atrac 1                @tab     @tab  X
 @item Atrac 3                @tab     @tab  X
 @item Delphine Software International CIN audio  @tab     @tab  X
     @tab Codec used in Delphine Software International games.

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 69f9702d9a7ac33215bc5ade7b2621a0eeda3ff7..8aabeb909e7c041e7ed974c42c8b76e4dc862d66 100644 (file)
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -48,6 +48,7 @@ OBJS-$(CONFIG_ASV1_DECODER)            += asv1.o mpeg12data.o
 OBJS-$(CONFIG_ASV1_ENCODER)            += asv1.o mpeg12data.o
 OBJS-$(CONFIG_ASV2_DECODER)            += asv1.o mpeg12data.o
 OBJS-$(CONFIG_ASV2_ENCODER)            += asv1.o mpeg12data.o
+OBJS-$(CONFIG_ATRAC1_DECODER)          += atrac1.o atrac.o
 OBJS-$(CONFIG_ATRAC3_DECODER)          += atrac3.o atrac.o
 OBJS-$(CONFIG_AVS_DECODER)             += avs.o
 OBJS-$(CONFIG_BETHSOFTVID_DECODER)     += bethsoftvideo.o

diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index e0007d923ee09a510dd357292dcb316fca11f558..2cd362743be7a49ade4d85b3af960e38bd2beb2d 100644 (file)
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -199,6 +199,7 @@ void avcodec_register_all(void)
     REGISTER_ENCDEC  (AC3, ac3);
     REGISTER_ENCDEC  (ALAC, alac);
     REGISTER_DECODER (APE, ape);
+    REGISTER_DECODER (ATRAC1, atrac1);
     REGISTER_DECODER (ATRAC3, atrac3);
     REGISTER_DECODER (COOK, cook);
     REGISTER_DECODER (DCA, dca);

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 3909b66d7a6d46f1ed8a503d2fe063b09b59e869..58d746fcc795436cc59fa0de91df66cf125db13d 100644 (file)
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -30,7 +30,7 @@
 #include "libavutil/avutil.h"
 
 #define LIBAVCODEC_VERSION_MAJOR 52
-#define LIBAVCODEC_VERSION_MINOR 35
+#define LIBAVCODEC_VERSION_MINOR 36
 #define LIBAVCODEC_VERSION_MICRO  0
 
 #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \

diff --git a/libavformat/Makefile b/libavformat/Makefile
index 72203cf753627ab5cd82ddf02d407981ed83f9c7..c0ec8ddb37122b9a57327164fe9dfcdd7a50cd22 100644 (file)
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -12,6 +12,7 @@ OBJS-$(CONFIG_AAC_DEMUXER)               += raw.o id3v1.o id3v2.o
 OBJS-$(CONFIG_AC3_DEMUXER)               += raw.o
 OBJS-$(CONFIG_AC3_MUXER)                 += raw.o
 OBJS-$(CONFIG_ADTS_MUXER)                += adtsenc.o
+OBJS-$(CONFIG_AEA_DEMUXER)               += aea.o
 OBJS-$(CONFIG_AIFF_DEMUXER)              += aiff.o riff.o raw.o
 OBJS-$(CONFIG_AIFF_MUXER)                += aiff.o riff.o
 OBJS-$(CONFIG_AMR_DEMUXER)               += amr.o

diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index 34b50cdb8ba60a85c33bf7a410430b643a698300..c35b060b5a319c2b158e8e8bd63f55e3854d1fba 100644 (file)
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -50,6 +50,7 @@ void av_register_all(void)
     REGISTER_DEMUXER  (AAC, aac);
     REGISTER_MUXDEMUX (AC3, ac3);
     REGISTER_MUXER    (ADTS, adts);
+    REGISTER_DEMUXER  (AEA, aea);
     REGISTER_MUXDEMUX (AIFF, aiff);
     REGISTER_MUXDEMUX (AMR, amr);
     REGISTER_DEMUXER  (APC, apc);

diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 1fd6ec04753cd9ee5e8aa36de372ba832b984812..be8c37429093f41e5f2782b9e9399fec27080cca 100644 (file)
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -22,7 +22,7 @@
 #define AVFORMAT_AVFORMAT_H
 
 #define LIBAVFORMAT_VERSION_MAJOR 52
-#define LIBAVFORMAT_VERSION_MINOR 38
+#define LIBAVFORMAT_VERSION_MINOR 39
 #define LIBAVFORMAT_VERSION_MICRO  0
 
 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \