aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJai Menon <jmenon86@gmail.com>2009-06-12 13:21:01 +0000
committerJai Menon <jmenon86@gmail.com>2009-06-12 13:21:01 +0000
commit8e6e9bacc4fd983741e4589bf5dd366c01ac4e15 (patch)
treecfd5e39fdbec3fbffe8a48cbca0d81a33458dbe2
parentae1374ce106d079f3f55085ffb1de1bb5677c979 (diff)
downloadffmpeg-8e6e9bacc4fd983741e4589bf5dd366c01ac4e15.tar.gz
Associate the 0x6c75 TwoCC used in certain Kodak cameras
to the PCM Mu-law decoder. Fixes Issue 1178. Originally committed as revision 19166 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavformat/riff.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/riff.c b/libavformat/riff.c
index d9b4f449a7..5b8c272f93 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -254,6 +254,7 @@ const AVCodecTag codec_wav_tags[] = {
{ CODEC_ID_DTS, 0x2001 },
{ CODEC_ID_SONIC, 0x2048 },
{ CODEC_ID_SONIC_LS, 0x2048 },
+ { CODEC_ID_PCM_MULAW, 0x6c75 },
{ CODEC_ID_AAC, 0x706d },
{ CODEC_ID_AAC, 0x4143 },
{ CODEC_ID_FLAC, 0xF1AC },