Mercurial > libavformat.hg
comparison isom.c @ 2976:44bc0517584d libavformat
reorder object types id by muxing preference
author | bcoudurier |
---|---|
date | Mon, 28 Jan 2008 13:19:49 +0000 |
parents | 4b6a9b61e9dd |
children | b346700f30d9 |
comparison
equal
deleted
inserted
replaced
2975:be1915a872e2 | 2976:44bc0517584d |
---|---|
24 #include "avformat.h" | 24 #include "avformat.h" |
25 #include "riff.h" | 25 #include "riff.h" |
26 #include "isom.h" | 26 #include "isom.h" |
27 | 27 |
28 /* http://www.mp4ra.org */ | 28 /* http://www.mp4ra.org */ |
29 /* ordered by muxing preference */ | |
29 const AVCodecTag ff_mp4_obj_type[] = { | 30 const AVCodecTag ff_mp4_obj_type[] = { |
30 { CODEC_ID_MPEG4 , 32 }, | 31 { CODEC_ID_MPEG4 , 32 }, |
31 { CODEC_ID_H264 , 33 }, | 32 { CODEC_ID_H264 , 33 }, |
32 { CODEC_ID_AAC , 64 }, | 33 { CODEC_ID_AAC , 64 }, |
34 { CODEC_ID_MPEG2VIDEO, 97 }, /* MPEG2 Main */ | |
33 { CODEC_ID_MPEG2VIDEO, 96 }, /* MPEG2 Simple */ | 35 { CODEC_ID_MPEG2VIDEO, 96 }, /* MPEG2 Simple */ |
34 { CODEC_ID_MPEG2VIDEO, 97 }, /* MPEG2 Main */ | |
35 { CODEC_ID_MPEG2VIDEO, 98 }, /* MPEG2 SNR */ | 36 { CODEC_ID_MPEG2VIDEO, 98 }, /* MPEG2 SNR */ |
36 { CODEC_ID_MPEG2VIDEO, 99 }, /* MPEG2 Spatial */ | 37 { CODEC_ID_MPEG2VIDEO, 99 }, /* MPEG2 Spatial */ |
37 { CODEC_ID_MPEG2VIDEO, 100 }, /* MPEG2 High */ | 38 { CODEC_ID_MPEG2VIDEO, 100 }, /* MPEG2 High */ |
38 { CODEC_ID_MPEG2VIDEO, 101 }, /* MPEG2 422 */ | 39 { CODEC_ID_MPEG2VIDEO, 101 }, /* MPEG2 422 */ |
39 { CODEC_ID_AAC , 102 }, /* MPEG2 AAC Main */ | 40 { CODEC_ID_AAC , 102 }, /* MPEG2 AAC Main */ |
40 { CODEC_ID_AAC , 103 }, /* MPEG2 AAC Low */ | 41 { CODEC_ID_AAC , 103 }, /* MPEG2 AAC Low */ |
41 { CODEC_ID_AAC , 104 }, /* MPEG2 AAC SSR */ | 42 { CODEC_ID_AAC , 104 }, /* MPEG2 AAC SSR */ |
43 { CODEC_ID_MP3 , 107 }, /* 11172-3 */ | |
42 { CODEC_ID_MP3 , 105 }, /* 13818-3 */ | 44 { CODEC_ID_MP3 , 105 }, /* 13818-3 */ |
43 { CODEC_ID_MPEG1VIDEO, 106 }, /* 11172-2 */ | 45 { CODEC_ID_MPEG1VIDEO, 106 }, /* 11172-2 */ |
44 { CODEC_ID_MP3 , 107 }, /* 11172-3 */ | |
45 { CODEC_ID_MJPEG , 108 }, /* 10918-1 */ | 46 { CODEC_ID_MJPEG , 108 }, /* 10918-1 */ |
46 { CODEC_ID_PNG , 109 }, | 47 { CODEC_ID_PNG , 109 }, |
47 { CODEC_ID_JPEG2000 , 110 }, /* 15444-1 */ | 48 { CODEC_ID_JPEG2000 , 110 }, /* 15444-1 */ |
48 { CODEC_ID_VC1 , 163 }, | 49 { CODEC_ID_VC1 , 163 }, |
49 { CODEC_ID_VORBIS , 221 }, /* non standard, gpac uses it */ | 50 { CODEC_ID_VORBIS , 221 }, /* non standard, gpac uses it */ |