diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2008-09-02 19:13:25 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2008-09-02 19:13:25 +0000 |
| commit | 428626d5d1df3c29d94ef9f7794fabb67a7e1013 (patch) | |
| tree | a2335b323088af4907975eb4e37f35ce868ba42e /libavformat | |
| parent | d3bb8ad7afcfa82ed02fba1cd20b933cc45454d6 (diff) | |
| download | ffmpeg-428626d5d1df3c29d94ef9f7794fabb67a7e1013.tar.gz | |
allow mp2 to be muxed into mp4
Originally committed as revision 15155 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/isom.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/isom.c b/libavformat/isom.c index bfe27354dd..d4f16dd0bf 100644 --- a/libavformat/isom.c +++ b/libavformat/isom.c @@ -41,6 +41,7 @@ const AVCodecTag ff_mp4_obj_type[] = { { CODEC_ID_AAC , 103 }, /* MPEG2 AAC Low */ { CODEC_ID_AAC , 104 }, /* MPEG2 AAC SSR */ { CODEC_ID_MP3 , 107 }, /* 11172-3 */ + { CODEC_ID_MP2 , 107 }, /* 11172-3 */ { CODEC_ID_MP3 , 105 }, /* 13818-3 */ { CODEC_ID_MPEG1VIDEO, 106 }, /* 11172-2 */ { CODEC_ID_MJPEG , 108 }, /* 10918-1 */ |