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
23f589e0
Commit
23f589e0
authored
Nov 12, 2018
by
Paul B Mahol
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avfilter/vf_alphamerge: do not check for ret value if all wanted frames are present
It is not needed and may be uninitialized.
parent
ae432354
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
7 deletions
+5
-7
vf_alphamerge.c
libavfilter/vf_alphamerge.c
+5
-7
No files found.
libavfilter/vf_alphamerge.c
View file @
23f589e0
...
...
@@ -154,13 +154,11 @@ static int activate(AVFilterContext *ctx)
}
if
(
s
->
main_frame
&&
s
->
alpha_frame
)
{
if
(
ret
>
0
)
{
draw_frame
(
ctx
,
s
->
main_frame
,
s
->
alpha_frame
);
ret
=
ff_filter_frame
(
outlink
,
s
->
main_frame
);
av_frame_free
(
&
s
->
alpha_frame
);
s
->
main_frame
=
NULL
;
return
ret
;
}
draw_frame
(
ctx
,
s
->
main_frame
,
s
->
alpha_frame
);
ret
=
ff_filter_frame
(
outlink
,
s
->
main_frame
);
av_frame_free
(
&
s
->
alpha_frame
);
s
->
main_frame
=
NULL
;
return
ret
;
}
FF_FILTER_FORWARD_STATUS
(
ctx
->
inputs
[
0
],
outlink
);
...
...
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