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:
2f980d2
)
cosmetics, move up mpeg1video mp4 objecttype
author
Baptiste Coudurier
<baptiste.coudurier@gmail.com>
Wed, 3 Sep 2008 19:18:49 +0000
(19:18 +0000)
committer
Baptiste Coudurier
<baptiste.coudurier@gmail.com>
Wed, 3 Sep 2008 19:18:49 +0000
(19:18 +0000)
Originally committed as revision 15187 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavformat/isom.c
patch
|
blob
|
history
diff --git
a/libavformat/isom.c
b/libavformat/isom.c
index
58e947a
..
20cad55
100644
(file)
--- 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_MPEG1VIDEO, 0x6A }, /* 11172-2 */
{ CODEC_ID_MP3 , 0x6B }, /* 11172-3 */
{ CODEC_ID_MP2 , 0x6B }, /* 11172-3 */
{ CODEC_ID_MP3 , 0x69 }, /* 13818-3 */
- { CODEC_ID_MPEG1VIDEO, 0x6A }, /* 11172-2 */
{ CODEC_ID_MJPEG , 0x6C }, /* 10918-1 */
{ CODEC_ID_PNG , 0x6D },
{ CODEC_ID_JPEG2000 , 0x6E }, /* 15444-1 */