virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

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

Browse Source 
AudioObjectType. Also bump libavcodec minor version.

Originally committed as revision 18591 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Jai Menon 2009-04-17 19:17:14 +00:00
parent e5986d0427
commit b24bbbb4da
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/avcodec.h
View File

@ -30,7 +30,7 @@
#include "libavutil/avutil.h" #include "libavutil/avutil.h"
#define LIBAVCODEC_VERSION_MAJOR 52 #define LIBAVCODEC_VERSION_MAJOR 52
#define LIBAVCODEC_VERSION_MINOR 25 #define LIBAVCODEC_VERSION_MINOR 26
#define LIBAVCODEC_VERSION_MICRO 0 #define LIBAVCODEC_VERSION_MICRO 0
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
@ -313,6 +313,7 @@ enum CodecID {
CODEC_ID_MP1, CODEC_ID_MP1,
CODEC_ID_TWINVQ, CODEC_ID_TWINVQ,
CODEC_ID_TRUEHD, CODEC_ID_TRUEHD,
CODEC_ID_MP4ALS,
/* subtitle codecs */ /* subtitle codecs */
CODEC_ID_DVD_SUBTITLE= 0x17000, CODEC_ID_DVD_SUBTITLE= 0x17000,

1
libavformat/mov.c
View File

@ -384,6 +384,7 @@ static const AVCodecTag mp4_audio_types[] = {
{ CODEC_ID_MP3ON4, AOT_L1 }, /* layer 1 */ { CODEC_ID_MP3ON4, AOT_L1 }, /* layer 1 */
{ CODEC_ID_MP3ON4, AOT_L2 }, /* layer 2 */ { CODEC_ID_MP3ON4, AOT_L2 }, /* layer 2 */
{ CODEC_ID_MP3ON4, AOT_L3 }, /* layer 3 */ { CODEC_ID_MP3ON4, AOT_L3 }, /* layer 3 */
{ CODEC_ID_MP4ALS, AOT_ALS }, /* MPEG-4 ALS */
{ CODEC_ID_NONE, AOT_NULL }, { CODEC_ID_NONE, AOT_NULL },
}; };