[FFmpeg-cvslog] r18591 - in trunk: libavcodec/avcodec.h libavformat/mov.c

[jai_menon]

Author: jai_menon
Date: Fri Apr 17 21:17:14 2009
New Revision: 18591

Log:
Introduce codec id for MPEG-4 ALS and associate it with corresponding 
AudioObjectType. Also bump libavcodec minor version.

Modified:
   trunk/libavcodec/avcodec.h
   trunk/libavformat/mov.c

Modified: trunk/libavcodec/avcodec.h
==============================================================================
--- trunk/libavcodec/avcodec.h	Fri Apr 17 21:14:11 2009	(r18590)
+++ trunk/libavcodec/avcodec.h	Fri Apr 17 21:17:14 2009	(r18591)
@@ -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,

Modified: trunk/libavformat/mov.c
==============================================================================
--- trunk/libavformat/mov.c	Fri Apr 17 21:14:11 2009	(r18590)
+++ trunk/libavformat/mov.c	Fri Apr 17 21:17:14 2009	(r18591)
@@ -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 },
 };