Mercurial > libavformat.hg

changeset 5027:702bfee61683 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author conrad
date Sat, 13 Jun 2009 00:50:57 +0000
parents 73338486a311
children 4ba7fd2077bd
files isom.c mov.c
diffstat 2 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/isom.c	Sat Jun 13 00:16:39 2009 +0000
+++ b/isom.c	Sat Jun 13 00:50:57 2009 +0000
@@ -190,7 +190,6 @@
     { 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 */
--- a/mov.c	Sat Jun 13 00:16:39 2009 +0000
+++ b/mov.c	Sat Jun 13 00:50:57 2009 +0000
@@ -792,7 +792,7 @@
 
         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) {