reorder object types id by muxing preference

Originally committed as revision 11648 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier 2008-01-28 13:19:49 +00:00
parent 2c2f58c0ad
commit efc9e44da6

View File

@ -26,12 +26,13 @@
#include "isom.h"
/* http://www.mp4ra.org */
/* ordered by muxing preference */
const AVCodecTag ff_mp4_obj_type[] = {
{ CODEC_ID_MPEG4 , 32 },
{ CODEC_ID_H264 , 33 },
{ CODEC_ID_AAC , 64 },
{ CODEC_ID_MPEG2VIDEO, 96 }, /* MPEG2 Simple */
{ CODEC_ID_MPEG2VIDEO, 97 }, /* MPEG2 Main */
{ CODEC_ID_MPEG2VIDEO, 96 }, /* MPEG2 Simple */
{ CODEC_ID_MPEG2VIDEO, 98 }, /* MPEG2 SNR */
{ CODEC_ID_MPEG2VIDEO, 99 }, /* MPEG2 Spatial */
{ CODEC_ID_MPEG2VIDEO, 100 }, /* MPEG2 High */
@ -39,9 +40,9 @@ const AVCodecTag ff_mp4_obj_type[] = {
{ CODEC_ID_AAC , 102 }, /* MPEG2 AAC Main */
{ CODEC_ID_AAC , 103 }, /* MPEG2 AAC Low */
{ CODEC_ID_AAC , 104 }, /* MPEG2 AAC SSR */
{ CODEC_ID_MP3 , 107 }, /* 11172-3 */
{ CODEC_ID_MP3 , 105 }, /* 13818-3 */
{ CODEC_ID_MPEG1VIDEO, 106 }, /* 11172-2 */
{ CODEC_ID_MP3 , 107 }, /* 11172-3 */
{ CODEC_ID_MJPEG , 108 }, /* 10918-1 */
{ CODEC_ID_PNG , 109 },
{ CODEC_ID_JPEG2000 , 110 }, /* 15444-1 */