virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

allow mp2 to be muxed into mp4

Browse Source 
Originally committed as revision 15155 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier
2008-09-02 19:13:25 +00:00
parent d3bb8ad7af
commit 428626d5d1
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libavformat/isom.c
View File

@@ -41,6 +41,7 @@ const AVCodecTag ff_mp4_obj_type[] = {
{ CODEC_ID_AAC , 103 }, /* MPEG2 AAC Low */ { CODEC_ID_AAC , 103 }, /* MPEG2 AAC Low */
{ CODEC_ID_AAC , 104 }, /* MPEG2 AAC SSR */ { CODEC_ID_AAC , 104 }, /* MPEG2 AAC SSR */
{ CODEC_ID_MP3 , 107 }, /* 11172-3 */ { CODEC_ID_MP3 , 107 }, /* 11172-3 */
{ CODEC_ID_MP2 , 107 }, /* 11172-3 */
{ CODEC_ID_MP3 , 105 }, /* 13818-3 */ { CODEC_ID_MP3 , 105 }, /* 13818-3 */
{ CODEC_ID_MPEG1VIDEO, 106 }, /* 11172-2 */ { CODEC_ID_MPEG1VIDEO, 106 }, /* 11172-2 */
{ CODEC_ID_MJPEG , 108 }, /* 10918-1 */ { CODEC_ID_MJPEG , 108 }, /* 10918-1 */