[FFmpeg-cvslog] r19177 - in trunk/libavformat: isom.c mov.c

[conrad]

Author: conrad
Date: Sat Jun 13 02:50:57 2009
New Revision: 19177

Log:
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.

Modified:
   trunk/libavformat/isom.c
   trunk/libavformat/mov.c

Modified: trunk/libavformat/isom.c
==============================================================================
--- trunk/libavformat/isom.c	Sat Jun 13 02:16:39 2009	(r19176)
+++ trunk/libavformat/isom.c	Sat Jun 13 02:50:57 2009	(r19177)
@@ -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 */

Modified: trunk/libavformat/mov.c
==============================================================================
--- trunk/libavformat/mov.c	Sat Jun 13 02:16:39 2009	(r19176)
+++ trunk/libavformat/mov.c	Sat Jun 13 02:50:57 2009	(r19177)
@@ -792,7 +792,7 @@ static int mov_read_stsd(MOVContext *c, 
 
         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) {