Introduce codec id for MPEG-4 ALS and associate it with corresponding

AudioObjectType. Also bump libavcodec minor version.

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@18591 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 50c70d6d1accd282983d8b26e185df33712a04a5..05027bacdf824e0bd147be8f2ad253642581ea22 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 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 175c2c24828d09bc20b73648819c5b8390852862..f68e7aeac420f3d8945be673732a641e1dc71753 100644 (file)
--- 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 },
 };