Revision 86b61d42
| libavformat/isom.c | ||
|---|---|---|
| 190 | 190 |
{ CODEC_ID_PCM_ALAW, MKTAG('a', 'l', 'a', 'w') }, /* */
|
| 191 | 191 |
|
| 192 | 192 |
{ CODEC_ID_ADPCM_IMA_QT, MKTAG('i', 'm', 'a', '4') }, /* IMA-4 ADPCM */
|
| 193 |
{ CODEC_ID_ADPCM_IMA_WAV, MKTAG('T', 'S', 0x00, 0x11) },
|
|
| 194 | 193 |
|
| 195 | 194 |
{ CODEC_ID_MACE3, MKTAG('M', 'A', 'C', '3') }, /* Macintosh Audio Compression and Expansion 3:1 */
|
| 196 | 195 |
{ CODEC_ID_MACE6, MKTAG('M', 'A', 'C', '6') }, /* Macintosh Audio Compression and Expansion 6:1 */
|
| libavformat/mov.c | ||
|---|---|---|
| 792 | 792 |
|
| 793 | 793 |
st->codec->codec_tag = format; |
| 794 | 794 |
id = codec_get_id(codec_movaudio_tags, format); |
| 795 |
if (id<=0 && (format&0xFFFF) == 'm'+('s'<<8))
|
|
| 795 |
if (id<=0 && ((format&0xFFFF) == 'm'+('s'<<8) || (format&0xFFFF) == 'T'+('S'<<8)))
|
|
| 796 | 796 |
id = codec_get_id(codec_wav_tags, bswap_32(format)&0xFFFF); |
| 797 | 797 |
|
| 798 | 798 |
if (st->codec->codec_type != CODEC_TYPE_VIDEO && id > 0) {
|
Also available in: Unified diff