Skip to content

V
vlc
Commit 0044061f authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

Map Yamaha ADPCM to wf_tag 

This should fix Yamaha ADPCM in MKV
parent df8db6ac
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 0 deletions
include/vlc_codecs.h
View file @ 0044061f
...@@ -225,6 +225,7 @@ ATTR_PACKED ...@@ -225,6 +225,7 @@ ATTR_PACKED
#define WAVE_FORMAT_DTS_MS 0x0008 /* Microsoft Corporation */ #define WAVE_FORMAT_DTS_MS 0x0008 /* Microsoft Corporation */
#define WAVE_FORMAT_WMAS 0x000a /* WMA 9 Speech */ #define WAVE_FORMAT_WMAS 0x000a /* WMA 9 Speech */
#define WAVE_FORMAT_IMA_ADPCM 0x0011 /* Intel Corporation */ #define WAVE_FORMAT_IMA_ADPCM 0x0011 /* Intel Corporation */
#define WAVE_FORMAT_YAMAHA_ADPCM 0x0020 /* Yamaha */
#define WAVE_FORMAT_TRUESPEECH 0x0022 /* TrueSpeech */ #define WAVE_FORMAT_TRUESPEECH 0x0022 /* TrueSpeech */
#define WAVE_FORMAT_GSM610 0x0031 /* Microsoft Corporation */ #define WAVE_FORMAT_GSM610 0x0031 /* Microsoft Corporation */
#define WAVE_FORMAT_MSNAUDIO 0x0032 /* Microsoft Corporation */ #define WAVE_FORMAT_MSNAUDIO 0x0032 /* Microsoft Corporation */
...@@ -336,6 +337,7 @@ wave_format_tag_to_fourcc[] = ...@@ -336,6 +337,7 @@ wave_format_tag_to_fourcc[] =
{ WAVE_FORMAT_ALAW, VLC_CODEC_ALAW, "A-Law" }, { WAVE_FORMAT_ALAW, VLC_CODEC_ALAW, "A-Law" },
{ WAVE_FORMAT_MULAW, VLC_CODEC_MULAW, "Mu-Law" }, { WAVE_FORMAT_MULAW, VLC_CODEC_MULAW, "Mu-Law" },
{ WAVE_FORMAT_IMA_ADPCM, VLC_CODEC_ADPCM_IMA_WAV, "Ima-ADPCM" }, { 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_TRUESPEECH, VLC_FOURCC(0x22, 0x0, 0x0, 0x0 ), "Truespeech" },
{ WAVE_FORMAT_GSM610, VLC_CODEC_GSM_MS, "Microsoft WAV GSM" }, { WAVE_FORMAT_GSM610, VLC_CODEC_GSM_MS, "Microsoft WAV GSM" },
{ WAVE_FORMAT_G726, VLC_CODEC_ADPCM_G726, "G.726 ADPCM" }, { WAVE_FORMAT_G726, VLC_CODEC_ADPCM_G726, "G.726 ADPCM" },
......
modules/codec/avcodec/fourcc.c
View file @ 0044061f
...@@ -359,6 +359,7 @@ static const struct ...@@ -359,6 +359,7 @@ static const struct
{ VLC_CODEC_ADPCM_MS, CODEC_ID_ADPCM_MS, AUDIO_ES }, { 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_WAV, CODEC_ID_ADPCM_IMA_WAV, AUDIO_ES },
{ VLC_CODEC_ADPCM_IMA_AMV, CODEC_ID_ADPCM_IMA_AMV, 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 }, { VLC_CODEC_VMDAUDIO, CODEC_ID_VMDAUDIO, AUDIO_ES },
......
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