aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Garrett-Glaser <darkshikari@gmail.com>2009-06-13 00:16:39 +0000
committerJason Garrett-Glaser <darkshikari@gmail.com>2009-06-13 00:16:39 +0000
commit761cb871737b46efc887276bde3334c32d3edd7b (patch)
tree2d8c2fbecc463ebc795c8b1b8f992ef5d5278996
parentd4eeef0c1942074255d6cb950614a689ba29d941 (diff)
downloadffmpeg-761cb871737b46efc887276bde3334c32d3edd7b.tar.gz
Add "0x11005354" as a fourcc for MOV audio; fixes audio detection in a problematic MOV file.
The audio is actually adpcm_ima_wav. Originally committed as revision 19176 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavformat/isom.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/isom.c b/libavformat/isom.c
index 0a410c17c4..0d16870c2a 100644
--- a/libavformat/isom.c
+++ b/libavformat/isom.c
@@ -190,6 +190,7 @@ const AVCodecTag codec_movaudio_tags[] = {
{ 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_WAV, MKTAG('T', 'S', 0x00, 0x11) },
{ 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 */