[vlc-commits] Map Yamaha ADPCM to wf_tag

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Fri Apr 13 00:45:37 2012 +0200| [0044061febe53688c41f3bd18501d49213fd95f1] | committer: Jean-Baptiste Kempf

Map Yamaha ADPCM to wf_tag

This should fix Yamaha ADPCM in MKV

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0044061febe53688c41f3bd18501d49213fd95f1
---

 include/vlc_codecs.h           |    2 ++
 modules/codec/avcodec/fourcc.c |    1 +
 2 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/include/vlc_codecs.h b/include/vlc_codecs.h
index 9e5979c..c75325b 100644
--- a/include/vlc_codecs.h
+++ b/include/vlc_codecs.h
@@ -225,6 +225,7 @@ ATTR_PACKED
 #define WAVE_FORMAT_DTS_MS              0x0008 /* Microsoft Corporation */
 #define WAVE_FORMAT_WMAS                0x000a /* WMA 9 Speech */
 #define WAVE_FORMAT_IMA_ADPCM           0x0011 /* Intel Corporation */
+#define WAVE_FORMAT_YAMAHA_ADPCM        0x0020 /* Yamaha */
 #define WAVE_FORMAT_TRUESPEECH          0x0022 /* TrueSpeech */
 #define WAVE_FORMAT_GSM610              0x0031 /* Microsoft Corporation */
 #define WAVE_FORMAT_MSNAUDIO            0x0032 /* Microsoft Corporation */
@@ -336,6 +337,7 @@ wave_format_tag_to_fourcc[] =
     { WAVE_FORMAT_ALAW,       VLC_CODEC_ALAW,                   "A-Law" },
     { WAVE_FORMAT_MULAW,      VLC_CODEC_MULAW,                  "Mu-Law" },
     { WAVE_FORMAT_IMA_ADPCM,  VLC_CODEC_ADPCM_IMA_WAV,          "Ima-ADPCM" },
+    { WAVE_FORMAT_YAMAHA_ADPCM, VLC_CODEC_ADPCM_YAMAHA,         "Yamaha ADPCM" },
     { WAVE_FORMAT_TRUESPEECH, VLC_FOURCC(0x22, 0x0, 0x0, 0x0 ), "Truespeech" },
     { WAVE_FORMAT_GSM610,     VLC_CODEC_GSM_MS,                 "Microsoft WAV GSM" },
     { WAVE_FORMAT_G726,       VLC_CODEC_ADPCM_G726,             "G.726 ADPCM" },
diff --git a/modules/codec/avcodec/fourcc.c b/modules/codec/avcodec/fourcc.c
index b8cb2c6..b6b99e0 100644
--- a/modules/codec/avcodec/fourcc.c
+++ b/modules/codec/avcodec/fourcc.c
@@ -359,6 +359,7 @@ static const struct
     { VLC_CODEC_ADPCM_MS, CODEC_ID_ADPCM_MS, AUDIO_ES },
     { VLC_CODEC_ADPCM_IMA_WAV, CODEC_ID_ADPCM_IMA_WAV, AUDIO_ES },
     { VLC_CODEC_ADPCM_IMA_AMV, CODEC_ID_ADPCM_IMA_AMV, AUDIO_ES },
+    { VLC_CODEC_ADPCM_YAMAHA, CODEC_ID_ADPCM_YAMAHA, AUDIO_ES },
 
     { VLC_CODEC_VMDAUDIO, CODEC_ID_VMDAUDIO, AUDIO_ES },