From 86b61d4241cd075f84f99981cfafb973e0d53cdb Mon Sep 17 00:00:00 2001 From: David Conrad Date: Sat, 13 Jun 2009 00:50:57 +0000 Subject: 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 --- libavformat/mov.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libavformat/mov.c') diff --git a/libavformat/mov.c b/libavformat/mov.c index e6f60d40c3..af94394516 100644 --- 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) { -- cgit v1.2.3