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

David Conrad committed 17 years ago

Commit 86b61d41 parent 761cb872 files · +1 −2Browse files

Unified · Split

2 files

libavformat/isom.c +0 −1
libavformat/mov.c +1 −1

libavformat/isom.c+0−1

@@ -190,7 +190,6 @@ const AVCodecTag codec_movaudio_tags[] = { · 189 unmodified lines
190	{ CODEC_ID_PCM_ALAW, MKTAG('a', 'l', 'a', 'w') }, /* */	190	{ CODEC_ID_PCM_ALAW, MKTAG('a', 'l', 'a', 'w') }, /* */
191		191
192	{ CODEC_ID_ADPCM_IMA_QT, MKTAG('i', 'm', 'a', '4') }, /* IMA-4 ADPCM */	192	{ CODEC_ID_ADPCM_IMA_QT, MKTAG('i', 'm', 'a', '4') }, /* IMA-4 ADPCM */
193	{ CODEC_ID_ADPCM_IMA_WAV, MKTAG('T', 'S', 0x00, 0x11) },
194		193
195	{ CODEC_ID_MACE3, MKTAG('M', 'A', 'C', '3') }, /* Macintosh Audio Compression and Expansion 3:1 */	194	{ CODEC_ID_MACE3, MKTAG('M', 'A', 'C', '3') }, /* Macintosh Audio Compression and Expansion 3:1 */
196	{ CODEC_ID_MACE6, MKTAG('M', 'A', 'C', '6') }, /* Macintosh Audio Compression and Expansion 6:1 */	195	{ CODEC_ID_MACE6, MKTAG('M', 'A', 'C', '6') }, /* Macintosh Audio Compression and Expansion 6:1 */

libavformat/mov.c+1−1

@@ -792,7 +792,7 @@ static int mov_read_stsd(MOVContext c, ByteIOContext pb, MOVAtom atom) · 791 unmodified lines
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) {