Commit bca7db35 authored by Michael Niedermayer's avatar Michael Niedermayer

detect MS wav codecs

fixes detection of audio codec though not playback of surge-2-16-L-ms11.mov

Originally committed as revision 9885 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent d63f6fea
...@@ -603,6 +603,9 @@ static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) ...@@ -603,6 +603,9 @@ static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOV_atom_t 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))
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) {
st->codec->codec_type = CODEC_TYPE_AUDIO; st->codec->codec_type = CODEC_TYPE_AUDIO;
} else if (st->codec->codec_type != CODEC_TYPE_AUDIO && /* do not overwrite codec type */ } else if (st->codec->codec_type != CODEC_TYPE_AUDIO && /* do not overwrite codec type */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment