opensource/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-06-30 04:47:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Also accept TS as a prefix for wav twoccs (used by Flip4Mac) instead of

Browse Source 
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
This commit is contained in:
David Conrad
2009-06-13 00:50:57 +00:00
parent 761cb87173
commit 86b61d4241
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libavformat/isom.c
View File

@ -190,7 +190,6 @@ const AVCodecTag codec_movaudio_tags[] = {
{ CODEC_ID_PCM_ALAW, MKTAG('a', 'l', 'a', 'w') }, /* */ { 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_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_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 */ { CODEC_ID_MACE6, MKTAG('M', 'A', 'C', '6') }, /* Macintosh Audio Compression and Expansion 6:1 */

2
libavformat/mov.c
View File

@ -792,7 +792,7 @@ static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOVAtom atom)
st->codec->codec_tag = format; st->codec->codec_tag = format;
id = codec_get_id(codec_movaudio_tags, 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); id = codec_get_id(codec_wav_tags, bswap_32(format)&0xFFFF);
if (st->codec->codec_type != CODEC_TYPE_VIDEO && id > 0) { if (st->codec->codec_type != CODEC_TYPE_VIDEO && id > 0) {