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

diff --git a/libavformat/isom.c b/libavformat/isom.c
index 0d16870c2a49ca9d5b804caf6960aba9cd7cb53b..0a410c17c4002cee4b3e4c2cc7304c558834fd72 100644 (file)
--- 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 e6f60d40c3572ba8b9e36d19e9189920ddf4f306..af94394516c5de76932e9da9c9bd775e2d9fc8f4 100644 (file)
--- 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) {