Mercurial > libavformat.hg

diff mov.c @ 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 7b260f4d453d
children e743de5125cd
line wrap: on
line diff
--- 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) {