Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
VLC
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
15
Merge Requests
15
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
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
Steve Lhomme
VLC
Commits
790d6b1f
Commit
790d6b1f
authored
Dec 08, 2017
by
François Cartegnie
🤞
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
codec: faad: don't reorder with random table
heap buffer ofw on no reorder
parent
e7d72a70
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
4 deletions
+5
-4
modules/codec/faad.c
modules/codec/faad.c
+5
-4
No files found.
modules/codec/faad.c
View file @
790d6b1f
...
...
@@ -525,7 +525,7 @@ static int DecodeBlock( decoder_t *p_dec, block_t *p_block )
else
pi_faad_channels_positions
[
i
]
=
0
;
}
aout_CheckChannelReorder
(
pi_faad_channels_positions
,
NULL
,
bool
b_reorder
=
aout_CheckChannelReorder
(
pi_faad_channels_positions
,
NULL
,
p_dec
->
fmt_out
.
audio
.
i_physical_channels
,
pi_neworder_table
);
...
...
@@ -546,9 +546,10 @@ static int DecodeBlock( decoder_t *p_dec, block_t *p_block )
memset
(
p_out
->
p_buffer
,
0
,
p_out
->
i_buffer
);
/* FIXME: replace when aout_channel_reorder can take samples from a different buffer */
DoReordering
(
(
uint32_t
*
)
p_out
->
p_buffer
,
samples
,
frame
.
samples
/
frame
.
channels
,
frame
.
channels
,
pi_neworder_table
);
if
(
b_reorder
)
DoReordering
(
(
uint32_t
*
)
p_out
->
p_buffer
,
samples
,
frame
.
samples
/
frame
.
channels
,
frame
.
channels
,
pi_neworder_table
);
if
(
p_sys
->
b_discontinuity
)
{
...
...
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