diff options
| author | Benjamin Larsson <banan@ludd.ltu.se> | 2009-09-22 17:28:03 +0000 |
|---|---|---|
| committer | Benjamin Larsson <banan@ludd.ltu.se> | 2009-09-22 17:28:03 +0000 |
| commit | 61dc238b45245c9e646d47ca8f51c089a1dfb913 (patch) | |
| tree | 0502cc3fa46735226751198fc2e0eeb51dbfe83d | |
| parent | e704b012f23044f5e1e95f5237c6c541b57bb625 (diff) | |
| download | ffmpeg-61dc238b45245c9e646d47ca8f51c089a1dfb913.tar.gz | |
Hook up the MD studio demuxer and Atrac1 decoder.
Originally committed as revision 19969 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | Changelog | 2 | ||||
| -rw-r--r-- | doc/general.texi | 2 | ||||
| -rw-r--r-- | libavcodec/Makefile | 1 | ||||
| -rw-r--r-- | libavcodec/allcodecs.c | 1 | ||||
| -rw-r--r-- | libavcodec/avcodec.h | 2 | ||||
| -rw-r--r-- | libavformat/Makefile | 1 | ||||
| -rw-r--r-- | libavformat/allformats.c | 1 | ||||
| -rw-r--r-- | libavformat/avformat.h | 2 |
8 files changed, 10 insertions, 2 deletions
@@ -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 d0d472e6d5..dc8620750a 100644 --- 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 69f9702d9a..8aabeb909e 100644 --- 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 e0007d923e..2cd362743b 100644 --- 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 3909b66d7a..58d746fcc7 100644 --- 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 72203cf753..c0ec8ddb37 100644 --- 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 34b50cdb8b..c35b060b5a 100644 --- 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 1fd6ec0475..be8c374290 100644 --- 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, \ |