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
f39136b0
Commit
f39136b0
authored
Aug 25, 2017
by
Paul B Mahol
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avfilter/af_merge: check ff_insert_inpad() for failure
Signed-off-by:
Paul B Mahol
<
onemda@gmail.com
>
parent
db5604ac
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
2 deletions
+5
-2
af_amerge.c
libavfilter/af_amerge.c
+5
-2
No files found.
libavfilter/af_amerge.c
View file @
f39136b0
...
...
@@ -322,7 +322,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamples)
static
av_cold
int
init
(
AVFilterContext
*
ctx
)
{
AMergeContext
*
s
=
ctx
->
priv
;
int
i
;
int
i
,
ret
;
s
->
in
=
av_calloc
(
s
->
nb_inputs
,
sizeof
(
*
s
->
in
));
if
(
!
s
->
in
)
...
...
@@ -336,7 +336,10 @@ static av_cold int init(AVFilterContext *ctx)
};
if
(
!
name
)
return
AVERROR
(
ENOMEM
);
ff_insert_inpad
(
ctx
,
i
,
&
pad
);
if
((
ret
=
ff_insert_inpad
(
ctx
,
i
,
&
pad
))
<
0
)
{
av_freep
(
&
pad
.
name
);
return
ret
;
}
}
return
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