diff options
| author | Jai Menon <jmenon86@gmail.com> | 2009-04-17 19:17:14 +0000 |
|---|---|---|
| committer | Jai Menon <jmenon86@gmail.com> | 2009-04-17 19:17:14 +0000 |
| commit | b24bbbb4da4ee8950a876ce6706aa3a03236fdd9 (patch) | |
| tree | 9ddaf6499699637695474f82dd90298d657fe46e | |
| parent | e5986d0427818bbdfceec3c8db2ff0a755275959 (diff) | |
| download | ffmpeg-b24bbbb4da4ee8950a876ce6706aa3a03236fdd9.tar.gz | |
Introduce codec id for MPEG-4 ALS and associate it with corresponding
AudioObjectType. Also bump libavcodec minor version.
Originally committed as revision 18591 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/avcodec.h | 3 | ||||
| -rw-r--r-- | libavformat/mov.c | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 50c70d6d1a..05027bacdf 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 25 +#define LIBAVCODEC_VERSION_MINOR 26 #define LIBAVCODEC_VERSION_MICRO 0 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ @@ -313,6 +313,7 @@ enum CodecID { CODEC_ID_MP1, CODEC_ID_TWINVQ, CODEC_ID_TRUEHD, + CODEC_ID_MP4ALS, /* subtitle codecs */ CODEC_ID_DVD_SUBTITLE= 0x17000, diff --git a/libavformat/mov.c b/libavformat/mov.c index 175c2c2482..f68e7aeac4 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -384,6 +384,7 @@ static const AVCodecTag mp4_audio_types[] = { { CODEC_ID_MP3ON4, AOT_L1 }, /* layer 1 */ { CODEC_ID_MP3ON4, AOT_L2 }, /* layer 2 */ { CODEC_ID_MP3ON4, AOT_L3 }, /* layer 3 */ + { CODEC_ID_MP4ALS, AOT_ALS }, /* MPEG-4 ALS */ { CODEC_ID_NONE, AOT_NULL }, }; |