Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
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
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
f191c98e
Commit
f191c98e
authored
Jan 20, 2015
by
Paul B Mahol
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avfilter/af_join: swap av_mallocz_array() args for consistency with the prototype
Signed-off-by:
Paul B Mahol
<
onemda@gmail.com
>
parent
357c6a92
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
af_join.c
libavfilter/af_join.c
+6
-6
No files found.
libavfilter/af_join.c
View file @
f191c98e
...
...
@@ -193,9 +193,9 @@ static av_cold int join_init(AVFilterContext *ctx)
}
s
->
nb_channels
=
av_get_channel_layout_nb_channels
(
s
->
channel_layout
);
s
->
channels
=
av_mallocz_array
(
s
izeof
(
*
s
->
channels
),
s
->
nb_channels
);
s
->
buffers
=
av_mallocz_array
(
s
izeof
(
*
s
->
buffers
),
s
->
nb_channels
);
s
->
input_frames
=
av_mallocz_array
(
s
izeof
(
*
s
->
input_frames
),
s
->
inputs
);
s
->
channels
=
av_mallocz_array
(
s
->
nb_channels
,
sizeof
(
*
s
->
channels
)
);
s
->
buffers
=
av_mallocz_array
(
s
->
nb_channels
,
sizeof
(
*
s
->
buffers
)
);
s
->
input_frames
=
av_mallocz_array
(
s
->
inputs
,
sizeof
(
*
s
->
input_frames
)
);
if
(
!
s
->
channels
||
!
s
->
buffers
||
!
s
->
input_frames
)
return
AVERROR
(
ENOMEM
);
...
...
@@ -308,7 +308,7 @@ static int join_config_output(AVFilterLink *outlink)
int
i
,
ret
=
0
;
/* initialize inputs to user-specified mappings */
if
(
!
(
inputs
=
av_mallocz_array
(
sizeof
(
*
inputs
),
ctx
->
nb_inputs
)))
if
(
!
(
inputs
=
av_mallocz_array
(
ctx
->
nb_inputs
,
sizeof
(
*
inputs
)
)))
return
AVERROR
(
ENOMEM
);
for
(
i
=
0
;
i
<
s
->
nb_channels
;
i
++
)
{
ChannelMap
*
ch
=
&
s
->
channels
[
i
];
...
...
@@ -448,8 +448,8 @@ static int join_request_frame(AVFilterLink *outlink)
/* create references to the buffers we copied to output */
if
(
nb_buffers
>
FF_ARRAY_ELEMS
(
frame
->
buf
))
{
frame
->
nb_extended_buf
=
nb_buffers
-
FF_ARRAY_ELEMS
(
frame
->
buf
);
frame
->
extended_buf
=
av_mallocz_array
(
sizeof
(
*
frame
->
extended_buf
)
,
frame
->
nb_extended_buf
);
frame
->
extended_buf
=
av_mallocz_array
(
frame
->
nb_extended_buf
,
sizeof
(
*
frame
->
extended_buf
)
);
if
(
!
frame
->
extended_buf
)
{
frame
->
nb_extended_buf
=
0
;
ret
=
AVERROR
(
ENOMEM
);
...
...
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