Mercurial > libavformat.hg
comparison isom.c @ 3885:4d5d454fae45 libavformat
dirac muxing support in mp4/mov
author | bcoudurier |
---|---|
date | Wed, 03 Sep 2008 19:23:24 +0000 |
parents | 6db8f3d6ef88 |
children | c8ab0676bba6 |
comparison
equal
deleted
inserted
replaced
3884:6db8f3d6ef88 | 3885:4d5d454fae45 |
---|---|
46 { CODEC_ID_MP3 , 0x69 }, /* 13818-3 */ | 46 { CODEC_ID_MP3 , 0x69 }, /* 13818-3 */ |
47 { CODEC_ID_MJPEG , 0x6C }, /* 10918-1 */ | 47 { CODEC_ID_MJPEG , 0x6C }, /* 10918-1 */ |
48 { CODEC_ID_PNG , 0x6D }, | 48 { CODEC_ID_PNG , 0x6D }, |
49 { CODEC_ID_JPEG2000 , 0x6E }, /* 15444-1 */ | 49 { CODEC_ID_JPEG2000 , 0x6E }, /* 15444-1 */ |
50 { CODEC_ID_VC1 , 0xA3 }, | 50 { CODEC_ID_VC1 , 0xA3 }, |
51 { CODEC_ID_DIRAC , 0xA4 }, | |
51 { CODEC_ID_AC3 , 0xA5 }, | 52 { CODEC_ID_AC3 , 0xA5 }, |
52 { CODEC_ID_VORBIS , 0xDD }, /* non standard, gpac uses it */ | 53 { CODEC_ID_VORBIS , 0xDD }, /* non standard, gpac uses it */ |
53 { CODEC_ID_DVD_SUBTITLE, 0xE0 }, /* non standard, see unsupported-embedded-subs-2.mp4 */ | 54 { CODEC_ID_DVD_SUBTITLE, 0xE0 }, /* non standard, see unsupported-embedded-subs-2.mp4 */ |
54 { CODEC_ID_QCELP , 0xE1 }, | 55 { CODEC_ID_QCELP , 0xE1 }, |
55 { 0, 0 }, | 56 { 0, 0 }, |
153 { CODEC_ID_PNG, MKTAG('p', 'n', 'g', ' ') }, | 154 { CODEC_ID_PNG, MKTAG('p', 'n', 'g', ' ') }, |
154 | 155 |
155 { CODEC_ID_VC1, MKTAG('v', 'c', '-', '1') }, /* SMPTE RP 2025 */ | 156 { CODEC_ID_VC1, MKTAG('v', 'c', '-', '1') }, /* SMPTE RP 2025 */ |
156 { CODEC_ID_CAVS, MKTAG('a', 'v', 's', '2') }, | 157 { CODEC_ID_CAVS, MKTAG('a', 'v', 's', '2') }, |
157 | 158 |
159 { CODEC_ID_DIRAC, MKTAG('d', 'r', 'a', 'c') }, | |
158 { CODEC_ID_DNXHD, MKTAG('A', 'V', 'd', 'n') }, /* AVID DNxHD */ | 160 { CODEC_ID_DNXHD, MKTAG('A', 'V', 'd', 'n') }, /* AVID DNxHD */ |
159 { CODEC_ID_SGI, MKTAG('s', 'g', 'i', ' ') }, /* SGI */ | 161 { CODEC_ID_SGI, MKTAG('s', 'g', 'i', ' ') }, /* SGI */ |
160 | 162 |
161 { CODEC_ID_NONE, 0 }, | 163 { CODEC_ID_NONE, 0 }, |
162 }; | 164 }; |