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
7a1020ae
Commit
7a1020ae
authored
Sep 05, 2007
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix old ffmpeg linking regression from [20357]
parent
c055a40c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
0 deletions
+6
-0
modules/codec/ffmpeg/audio.c
modules/codec/ffmpeg/audio.c
+6
-0
No files found.
modules/codec/ffmpeg/audio.c
View file @
7a1020ae
...
...
@@ -253,10 +253,16 @@ aout_buffer_t *E_( DecodeAudio )( decoder_t *p_dec, block_t **pp_block )
p_block
->
i_buffer
-=
FF_INPUT_BUFFER_PADDING_SIZE
;
memset
(
&
p_block
->
p_buffer
[
p_block
->
i_buffer
],
0
,
FF_INPUT_BUFFER_PADDING_SIZE
);
#if LIBAVCODEC_VERSION_INT >= ((52<<16)+(0<<8)+0)
i_output
=
__MAX
(
AVCODEC_MAX_AUDIO_FRAME_SIZE
,
p_block
->
i_buffer
);
i_used
=
avcodec_decode_audio2
(
p_sys
->
p_context
,
(
int16_t
*
)
p_sys
->
p_output
,
&
i_output
,
p_block
->
p_buffer
,
p_block
->
i_buffer
);
#else
i_used
=
avcodec_decode_audio
(
p_sys
->
p_context
,
(
int16_t
*
)
p_sys
->
p_output
,
&
i_output
,
p_block
->
p_buffer
,
p_block
->
i_buffer
);
#endif
if
(
i_used
<
0
||
i_output
<
0
)
{
...
...
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