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
fe816262
Commit
fe816262
authored
Sep 03, 2009
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
WMAPRO is inside FFmpeg now
parent
675bc55b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
0 deletions
+12
-0
modules/codec/avcodec/audio.c
modules/codec/avcodec/audio.c
+5
-0
modules/codec/avcodec/fourcc.c
modules/codec/avcodec/fourcc.c
+7
-0
No files found.
modules/codec/avcodec/audio.c
View file @
fe816262
...
...
@@ -195,6 +195,11 @@ int InitAudioDec( decoder_t *p_dec, AVCodecContext *p_context,
case
CODEC_ID_FLAC
:
p_sys
->
i_output_max
=
8
*
sizeof
(
int32_t
)
*
65535
;
break
;
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 35, 0 )
case
CODEC_ID_WMAPRO
:
p_sys
->
i_output_max
=
8
*
sizeof
(
float
)
*
6144
;
/* (1 << 12) * 3/2 */
break
;
#endif
default:
p_sys
->
i_output_max
=
0
;
break
;
...
...
modules/codec/avcodec/fourcc.c
View file @
fe816262
...
...
@@ -894,6 +894,13 @@ static const struct
{
VLC_FOURCC
(
'w'
,
'm'
,
'a'
,
'2'
),
CODEC_ID_WMAV2
,
AUDIO_ES
,
"Windows Media Audio 2"
},
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 35, 0 )
{
VLC_FOURCC
(
'W'
,
'M'
,
'A'
,
'P'
),
CODEC_ID_WMAPRO
,
AUDIO_ES
,
"Windows Media Audio Professional"
},
{
VLC_FOURCC
(
'w'
,
'm'
,
'a'
,
'p'
),
CODEC_ID_WMAPRO
,
AUDIO_ES
,
"Windows Media Audio Professional"
},
#endif
/* DV Audio */
{
VLC_FOURCC
(
'd'
,
'v'
,
'a'
,
'u'
),
CODEC_ID_DVAUDIO
,
AUDIO_ES
,
"DV Audio"
},
...
...
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