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
f6e4647f
Commit
f6e4647f
authored
Apr 27, 2014
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Map ON2 AVC audio codec
parent
4c1392b3
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
1 deletion
+12
-1
include/vlc_codecs.h
include/vlc_codecs.h
+6
-1
include/vlc_fourcc.h
include/vlc_fourcc.h
+1
-0
modules/codec/avcodec/fourcc.c
modules/codec/avcodec/fourcc.c
+5
-0
No files found.
include/vlc_codecs.h
View file @
f6e4647f
...
@@ -261,6 +261,9 @@ ATTR_PACKED
...
@@ -261,6 +261,9 @@ ATTR_PACKED
#define WAVE_FORMAT_IMC 0x0401
#define WAVE_FORMAT_IMC 0x0401
#define WAVE_FORMAT_INDEO_AUDIO 0x0402
/* Indeo Audio Coder */
#define WAVE_FORMAT_INDEO_AUDIO 0x0402
/* Indeo Audio Coder */
#define WAVE_FORMAT_ON2_AVC 0x0500
/* VP7 */
#define WAVE_FORMAT_ON2_AVC_2 0x0500
/* VP6 */
#define WAVE_FORMAT_AAC_2 0x1601
/* Other AAC */
#define WAVE_FORMAT_AAC_2 0x1601
/* Other AAC */
#define WAVE_FORMAT_AAC_LATM 0x1602
/* AAC/LATM */
#define WAVE_FORMAT_AAC_LATM 0x1602
/* AAC/LATM */
...
@@ -416,6 +419,8 @@ wave_format_tag_to_fourcc[] =
...
@@ -416,6 +419,8 @@ wave_format_tag_to_fourcc[] =
{
WAVE_FORMAT_IMC
,
VLC_CODEC_IMC
,
"IMC"
},
{
WAVE_FORMAT_IMC
,
VLC_CODEC_IMC
,
"IMC"
},
{
WAVE_FORMAT_INDEO_AUDIO
,
VLC_CODEC_INDEO_AUDIO
,
"Indeo Audio Coder"
},
{
WAVE_FORMAT_INDEO_AUDIO
,
VLC_CODEC_INDEO_AUDIO
,
"Indeo Audio Coder"
},
{
WAVE_FORMAT_VOXWARE_RT29
,
VLC_CODEC_METASOUND
,
"VoxWare MetaSound"
},
{
WAVE_FORMAT_VOXWARE_RT29
,
VLC_CODEC_METASOUND
,
"VoxWare MetaSound"
},
{
WAVE_FORMAT_ON2_AVC
,
VLC_CODEC_ON2AVC
,
"On2 Audio for Video Codec (VP7)"
},
{
WAVE_FORMAT_ON2_AVC_2
,
VLC_CODEC_ON2AVC
,
"On2 Audio for Video Codec (VP6)"
},
{
WAVE_FORMAT_UNKNOWN
,
VLC_FOURCC
(
'u'
,
'n'
,
'd'
,
'f'
),
"Unknown"
}
{
WAVE_FORMAT_UNKNOWN
,
VLC_FOURCC
(
'u'
,
'n'
,
'd'
,
'f'
),
"Unknown"
}
};
};
...
...
include/vlc_fourcc.h
View file @
f6e4647f
...
@@ -403,6 +403,7 @@
...
@@ -403,6 +403,7 @@
#define VLC_CODEC_ULEAD_DV_AUDIO_PAL VLC_FOURCC('m','s',0x02,0x16)
#define VLC_CODEC_ULEAD_DV_AUDIO_PAL VLC_FOURCC('m','s',0x02,0x16)
#define VLC_CODEC_INDEO_AUDIO VLC_FOURCC('m','s',0x04,0x02)
#define VLC_CODEC_INDEO_AUDIO VLC_FOURCC('m','s',0x04,0x02)
#define VLC_CODEC_METASOUND VLC_FOURCC('m','s',0x00,0x75)
#define VLC_CODEC_METASOUND VLC_FOURCC('m','s',0x00,0x75)
#define VLC_CODEC_ON2AVC VLC_FOURCC('m','s',0x05,0x00)
/* Subtitle */
/* Subtitle */
#define VLC_CODEC_SPU VLC_FOURCC('s','p','u',' ')
#define VLC_CODEC_SPU VLC_FOURCC('s','p','u',' ')
...
...
modules/codec/avcodec/fourcc.c
View file @
f6e4647f
...
@@ -457,6 +457,11 @@ static const struct
...
@@ -457,6 +457,11 @@ static const struct
#if LIBAVCODEC_VERSION_CHECK( 55, 15, 0, 24, 100 )
#if LIBAVCODEC_VERSION_CHECK( 55, 15, 0, 24, 100 )
{
VLC_CODEC_METASOUND
,
AV_CODEC_ID_METASOUND
,
AUDIO_ES
},
{
VLC_CODEC_METASOUND
,
AV_CODEC_ID_METASOUND
,
AUDIO_ES
},
#endif
#endif
/* AV_CODEC_ID_PAF_AUDIO */
#if LIBAVCODEC_VERSION_CHECK( 55, 49, 0, 59, 100 )
{
VLC_CODEC_ON2AVC
,
AV_CODEC_ID_ON2AVC
,
AUDIO_ES
},
#endif
/* ffmpeg only: AV_CODEC_ID_FFWAVESYNTH */
/* ffmpeg only: AV_CODEC_ID_FFWAVESYNTH */
/* ffmpeg only: AV_CODEC_ID_SONIC */
/* ffmpeg only: AV_CODEC_ID_SONIC */
/* ffmpeg only: AV_CODEC_ID_SONIC_LS */
/* ffmpeg only: AV_CODEC_ID_SONIC_LS */
...
...
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