Commit 428626d5 authored by Baptiste Coudurier's avatar Baptiste Coudurier
Browse files

allow mp2 to be muxed into mp4

Originally committed as revision 15155 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent d3bb8ad7
...@@ -41,6 +41,7 @@ const AVCodecTag ff_mp4_obj_type[] = { ...@@ -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 */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment