Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
0044061f
Commit
0044061f
authored
Apr 13, 2012
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Map Yamaha ADPCM to wf_tag
This should fix Yamaha ADPCM in MKV
parent
df8db6ac
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
0 deletions
+3
-0
include/vlc_codecs.h
include/vlc_codecs.h
+2
-0
modules/codec/avcodec/fourcc.c
modules/codec/avcodec/fourcc.c
+1
-0
No files found.
include/vlc_codecs.h
View file @
0044061f
...
...
@@ -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"
},
...
...
modules/codec/avcodec/fourcc.c
View file @
0044061f
...
...
@@ -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
},
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment