Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
e1b8d88d
Commit
e1b8d88d
authored
Oct 13, 2011
by
Justin Ruggles
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mlpdec: remove unnecessary wrapper function
parent
37b67f1b
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
12 deletions
+3
-12
mlpdec.c
libavcodec/mlpdec.c
+3
-12
No files found.
libavcodec/mlpdec.c
View file @
e1b8d88d
...
...
@@ -901,14 +901,15 @@ static void rematrix_channels(MLPDecodeContext *m, unsigned int substr)
/** Write the audio data into the output buffer. */
static
int
output_data
_internal
(
MLPDecodeContext
*
m
,
unsigned
int
substr
,
uint8_t
*
data
,
unsigned
int
*
data_size
,
int
is32
)
static
int
output_data
(
MLPDecodeContext
*
m
,
unsigned
int
substr
,
uint8_t
*
data
,
unsigned
int
*
data_size
)
{
SubStream
*
s
=
&
m
->
substream
[
substr
];
unsigned
int
i
,
out_ch
=
0
;
int
out_size
;
int32_t
*
data_32
=
(
int32_t
*
)
data
;
int16_t
*
data_16
=
(
int16_t
*
)
data
;
int
is32
=
(
m
->
avctx
->
sample_fmt
==
AV_SAMPLE_FMT_S32
);
if
(
m
->
avctx
->
channels
!=
s
->
max_matrix_channel
+
1
)
{
av_log
(
m
->
avctx
,
AV_LOG_ERROR
,
"channel count mismatch
\n
"
);
...
...
@@ -937,16 +938,6 @@ static int output_data_internal(MLPDecodeContext *m, unsigned int substr,
return
0
;
}
static
int
output_data
(
MLPDecodeContext
*
m
,
unsigned
int
substr
,
uint8_t
*
data
,
unsigned
int
*
data_size
)
{
if
(
m
->
avctx
->
sample_fmt
==
AV_SAMPLE_FMT_S32
)
return
output_data_internal
(
m
,
substr
,
data
,
data_size
,
1
);
else
return
output_data_internal
(
m
,
substr
,
data
,
data_size
,
0
);
}
/** Read an access unit from the stream.
* @return negative on error, 0 if not enough data is present in the input stream,
* otherwise the number of bytes consumed. */
...
...
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