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 /libavcodec | |
| 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
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/Makefile | 1 | ||||
| -rw-r--r-- | libavcodec/allcodecs.c | 1 | ||||
| -rw-r--r-- | libavcodec/avcodec.h | 2 |
3 files changed, 3 insertions, 1 deletions
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, \ |