Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
b737cab7
Commit
b737cab7
authored
Dec 20, 2010
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Codecs: map G.722 to avcodec decoder
Maybe .au demuxer should be modified accordingly
parent
dab00991
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
0 deletions
+8
-0
include/vlc_fourcc.h
include/vlc_fourcc.h
+1
-0
modules/codec/avcodec/fourcc.c
modules/codec/avcodec/fourcc.c
+3
-0
src/misc/fourcc.c
src/misc/fourcc.c
+4
-0
No files found.
include/vlc_fourcc.h
View file @
b737cab7
...
...
@@ -227,6 +227,7 @@
#define VLC_CODEC_ADPCM_XA VLC_FOURCC('x','a',' ',' ')
#define VLC_CODEC_ADPCM_ADX VLC_FOURCC('a','d','x',' ')
#define VLC_CODEC_ADPCM_IMA_WS VLC_FOURCC('A','I','W','S')
#define VLC_CODEC_ADPCM_G722 VLC_FOURCC('g','7','2','2')
#define VLC_CODEC_ADPCM_G726 VLC_FOURCC('g','7','2','6')
#define VLC_CODEC_ADPCM_SWF VLC_FOURCC('S','W','F','a')
#define VLC_CODEC_ADPCM_MS VLC_FOURCC('m','s',0x00,0x02)
...
...
modules/codec/avcodec/fourcc.c
View file @
b737cab7
...
...
@@ -354,6 +354,9 @@ static const struct
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 47, 0 )
{
VLC_CODEC_SIPR
,
CODEC_ID_SIPR
,
AUDIO_ES
},
#endif
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 91, 0 )
{
VLC_CODEC_ADPCM_G722
,
CODEC_ID_ADPCM_G722
,
AUDIO_ES
},
#endif
/* Lossless */
{
VLC_CODEC_FLAC
,
CODEC_ID_FLAC
,
AUDIO_ES
},
...
...
src/misc/fourcc.c
View file @
b737cab7
...
...
@@ -937,6 +937,10 @@ static const entry_t p_list_audio[] = {
B
(
VLC_CODEC_ADPCM_G726
,
"G.726 ADPCM Audio"
),
A
(
"g726"
),
/* G.722 ADPCM */
B
(
VLC_CODEC_ADPCM_G722
,
"G.722 ADPCM Audio"
),
A
(
"g722"
),
/* Flash ADPCM */
B
(
VLC_CODEC_ADPCM_SWF
,
"Flash ADPCM Audio"
),
A
(
"SWFa"
),
...
...
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