diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2008-09-03 19:42:09 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2008-09-03 19:42:09 +0000 |
| commit | c4e02d702c934fc350fdc6413caeb74e027ac416 (patch) | |
| tree | 2869d352f1fb27276f0a85f71819b5c291b6c7bd /libavformat/isom.c | |
| parent | e00c3de8210c39ab99b3c7aee3e0199ccdbf4c6b (diff) | |
change the logic to mux 13818-3 and 11172-3 in mp4, less code
Originally committed as revision 15190 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/isom.c')
| -rw-r--r-- | libavformat/isom.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/isom.c b/libavformat/isom.c index 8639cf1434..2e7154e6c2 100644 --- a/libavformat/isom.c +++ b/libavformat/isom.c @@ -40,10 +40,10 @@ const AVCodecTag ff_mp4_obj_type[] = { { CODEC_ID_AAC , 0x66 }, /* MPEG2 AAC Main */ { CODEC_ID_AAC , 0x67 }, /* MPEG2 AAC Low */ { CODEC_ID_AAC , 0x68 }, /* MPEG2 AAC SSR */ + { CODEC_ID_MP3 , 0x69 }, /* 13818-3 */ + { CODEC_ID_MP2 , 0x69 }, /* 11172-3 */ { CODEC_ID_MPEG1VIDEO, 0x6A }, /* 11172-2 */ { CODEC_ID_MP3 , 0x6B }, /* 11172-3 */ - { CODEC_ID_MP2 , 0x6B }, /* 11172-3 */ - { CODEC_ID_MP3 , 0x69 }, /* 13818-3 */ { CODEC_ID_MJPEG , 0x6C }, /* 10918-1 */ { CODEC_ID_PNG , 0x6D }, { CODEC_ID_JPEG2000 , 0x6E }, /* 15444-1 */ |