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 /libavformat | |
| 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 'libavformat')
| -rw-r--r-- | libavformat/Makefile | 1 | ||||
| -rw-r--r-- | libavformat/allformats.c | 1 | ||||
| -rw-r--r-- | libavformat/avformat.h | 2 |
3 files changed, 3 insertions, 1 deletions
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, \ |