Mercurial > libavformat.hg

comparison 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
comparison
equal deleted inserted replaced
5026:73338486a311 5027:702bfee61683
790 sc->pseudo_stream_id = st->codec->codec_tag ? -1 : pseudo_stream_id; 790 sc->pseudo_stream_id = st->codec->codec_tag ? -1 : pseudo_stream_id;
791 sc->dref_id= dref_id; 791 sc->dref_id= dref_id;
792 792
793 st->codec->codec_tag = format; 793 st->codec->codec_tag = format;
794 id = codec_get_id(codec_movaudio_tags, format); 794 id = codec_get_id(codec_movaudio_tags, format);
795 if (id<=0 && (format&0xFFFF) == 'm'+('s'<<8)) 795 if (id<=0 && ((format&0xFFFF) == 'm'+('s'<<8) || (format&0xFFFF) == 'T'+('S'<<8)))
796 id = codec_get_id(codec_wav_tags, bswap_32(format)&0xFFFF); 796 id = codec_get_id(codec_wav_tags, bswap_32(format)&0xFFFF);
797 797
798 if (st->codec->codec_type != CODEC_TYPE_VIDEO && id > 0) { 798 if (st->codec->codec_type != CODEC_TYPE_VIDEO && id > 0) {
799 st->codec->codec_type = CODEC_TYPE_AUDIO; 799 st->codec->codec_type = CODEC_TYPE_AUDIO;
800 } else if (st->codec->codec_type != CODEC_TYPE_AUDIO && /* do not overwrite codec type */ 800 } else if (st->codec->codec_type != CODEC_TYPE_AUDIO && /* do not overwrite codec type */