projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d3bb8ad
)
allow mp2 to be muxed into mp4
author
Baptiste Coudurier
<baptiste.coudurier@gmail.com>
Tue, 2 Sep 2008 19:13:25 +0000
(19:13 +0000)
committer
Baptiste Coudurier
<baptiste.coudurier@gmail.com>
Tue, 2 Sep 2008 19:13:25 +0000
(19:13 +0000)
Originally committed as revision 15155 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavformat/isom.c
patch
|
blob
|
history
diff --git
a/libavformat/isom.c
b/libavformat/isom.c
index
bfe2735
..
d4f16dd
100644
(file)
--- 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 */