diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2007-08-04 00:22:28 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2007-08-04 00:22:28 +0000 |
| commit | bca7db3530dd8d8036a3e57dc59af6000523aee3 (patch) | |
| tree | 290a7c67d091e6cc79e12e3ea60ab947c18d174e /libavformat/mov.c | |
| parent | d63f6fea50a0cc30da0b180c59ccd003fd214ccb (diff) | |
| download | ffmpeg-bca7db3530dd8d8036a3e57dc59af6000523aee3.tar.gz | |
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
Diffstat (limited to 'libavformat/mov.c')
| -rw-r--r-- | libavformat/mov.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index 1956a80dd6..f0b7d320bb 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -603,6 +603,9 @@ static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) st->codec->codec_tag = 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) { st->codec->codec_type = CODEC_TYPE_AUDIO; } else if (st->codec->codec_type != CODEC_TYPE_AUDIO && /* do not overwrite codec type */ |