diff options
| author | David Conrad <lessen42@gmail.com> | 2009-06-13 00:50:57 +0000 |
|---|---|---|
| committer | David Conrad <lessen42@gmail.com> | 2009-06-13 00:50:57 +0000 |
| commit | 86b61d4241cd075f84f99981cfafb973e0d53cdb (patch) | |
| tree | 7741b2fb12f8296f5acea6d9f2e0d323a91af82a | |
| parent | 761cb871737b46efc887276bde3334c32d3edd7b (diff) | |
| download | ffmpeg-86b61d4241cd075f84f99981cfafb973e0d53cdb.tar.gz | |
Also accept TS as a prefix for wav twoccs (used by Flip4Mac) instead of
adding entries to codec_movaudio_tags.
This ensures ADPCM_IMA_WAV uses the standard ms prefix when muxing to mov
rather than TS.
Originally committed as revision 19177 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/isom.c | 1 | ||||
| -rw-r--r-- | libavformat/mov.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/libavformat/isom.c b/libavformat/isom.c index 0d16870c2a..0a410c17c4 100644 --- a/libavformat/isom.c +++ b/libavformat/isom.c @@ -190,7 +190,6 @@ const AVCodecTag codec_movaudio_tags[] = { { CODEC_ID_PCM_ALAW, MKTAG('a', 'l', 'a', 'w') }, /* */ { CODEC_ID_ADPCM_IMA_QT, MKTAG('i', 'm', 'a', '4') }, /* IMA-4 ADPCM */ - { CODEC_ID_ADPCM_IMA_WAV, MKTAG('T', 'S', 0x00, 0x11) }, { CODEC_ID_MACE3, MKTAG('M', 'A', 'C', '3') }, /* Macintosh Audio Compression and Expansion 3:1 */ { CODEC_ID_MACE6, MKTAG('M', 'A', 'C', '6') }, /* Macintosh Audio Compression and Expansion 6:1 */ diff --git a/libavformat/mov.c b/libavformat/mov.c index e6f60d40c3..af94394516 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -792,7 +792,7 @@ static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOVAtom atom) st->codec->codec_tag = format; id = codec_get_id(codec_movaudio_tags, format); - if (id<=0 && (format&0xFFFF) == 'm'+('s'<<8)) + if (id<=0 && ((format&0xFFFF) == 'm'+('s'<<8) || (format&0xFFFF) == 'T'+('S'<<8))) id = codec_get_id(codec_wav_tags, bswap_32(format)&0xFFFF); if (st->codec->codec_type != CODEC_TYPE_VIDEO && id > 0) { |