# HG changeset patch # User bcoudurier # Date 1201526389 0 # Node ID 44bc0517584d844edd62cbfae5ff08b3f8f661ef # Parent be1915a872e2aa7bd03de54c784f0da53ec59b31 reorder object types id by muxing preference diff -r be1915a872e2 -r 44bc0517584d isom.c --- a/isom.c Mon Jan 28 13:19:16 2008 +0000 +++ b/isom.c Mon Jan 28 13:19:49 2008 +0000 @@ -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, 97 }, /* MPEG2 Main */ { CODEC_ID_MPEG2VIDEO, 96 }, /* MPEG2 Simple */ - { CODEC_ID_MPEG2VIDEO, 97 }, /* MPEG2 Main */ { CODEC_ID_MPEG2VIDEO, 98 }, /* MPEG2 SNR */ { CODEC_ID_MPEG2VIDEO, 99 }, /* MPEG2 Spatial */ { CODEC_ID_MPEG2VIDEO, 100 }, /* MPEG2 High */ @@ -39,9 +40,9 @@ { 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 */