Mercurial > libavformat.hg
comparison isom.c @ 2293:9aea08e128f9 libavformat
treat NONE as U8 to fix qtNONE/000_0032.MOV, this should not any have side effect since if bps is 16 in stsd, codec will be changed to s16be, just yell if this breaks any sample
author | bcoudurier |
---|---|
date | Mon, 30 Jul 2007 10:00:42 +0000 |
parents | 040bdd013062 |
children | 6bee167191aa |
comparison
equal
deleted
inserted
replaced
2292:f54b2020d564 | 2293:9aea08e128f9 |
---|---|
136 { CODEC_ID_PCM_S32BE, MKTAG('i', 'n', '3', '2') }, | 136 { CODEC_ID_PCM_S32BE, MKTAG('i', 'n', '3', '2') }, |
137 { CODEC_ID_PCM_S32LE, MKTAG('i', 'n', '3', '2') }, | 137 { CODEC_ID_PCM_S32LE, MKTAG('i', 'n', '3', '2') }, |
138 { CODEC_ID_PCM_S24BE, MKTAG('i', 'n', '2', '4') }, | 138 { CODEC_ID_PCM_S24BE, MKTAG('i', 'n', '2', '4') }, |
139 { CODEC_ID_PCM_S24LE, MKTAG('i', 'n', '2', '4') }, | 139 { CODEC_ID_PCM_S24LE, MKTAG('i', 'n', '2', '4') }, |
140 { CODEC_ID_PCM_S16BE, MKTAG('t', 'w', 'o', 's') }, /* 16 bits */ | 140 { CODEC_ID_PCM_S16BE, MKTAG('t', 'w', 'o', 's') }, /* 16 bits */ |
141 { CODEC_ID_PCM_S16BE, MKTAG('N', 'O', 'N', 'E') }, /* uncompressed */ | |
142 { CODEC_ID_PCM_S16LE, MKTAG('s', 'o', 'w', 't') }, /* */ | 141 { CODEC_ID_PCM_S16LE, MKTAG('s', 'o', 'w', 't') }, /* */ |
143 { CODEC_ID_PCM_S16LE, MKTAG('l', 'p', 'c', 'm') }, | 142 { CODEC_ID_PCM_S16LE, MKTAG('l', 'p', 'c', 'm') }, |
144 { CODEC_ID_PCM_S8, MKTAG('s', 'o', 'w', 't') }, | 143 { CODEC_ID_PCM_S8, MKTAG('s', 'o', 'w', 't') }, |
145 { CODEC_ID_PCM_U8, MKTAG('r', 'a', 'w', ' ') }, /* 8 bits unsigned */ | 144 { CODEC_ID_PCM_U8, MKTAG('r', 'a', 'w', ' ') }, /* 8 bits unsigned */ |
145 { CODEC_ID_PCM_U8, MKTAG('N', 'O', 'N', 'E') }, /* uncompressed */ | |
146 { CODEC_ID_PCM_MULAW, MKTAG('u', 'l', 'a', 'w') }, /* */ | 146 { CODEC_ID_PCM_MULAW, MKTAG('u', 'l', 'a', 'w') }, /* */ |
147 { CODEC_ID_PCM_ALAW, MKTAG('a', 'l', 'a', 'w') }, /* */ | 147 { CODEC_ID_PCM_ALAW, MKTAG('a', 'l', 'a', 'w') }, /* */ |
148 | 148 |
149 { CODEC_ID_ADPCM_IMA_QT, MKTAG('i', 'm', 'a', '4') }, /* IMA-4 ADPCM */ | 149 { CODEC_ID_ADPCM_IMA_QT, MKTAG('i', 'm', 'a', '4') }, /* IMA-4 ADPCM */ |
150 { CODEC_ID_ADPCM_MS, MKTAG('m', 's', 0x00, 0x02) }, /* MS ADPCM */ | 150 { CODEC_ID_ADPCM_MS, MKTAG('m', 's', 0x00, 0x02) }, /* MS ADPCM */ |