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
cbd5a453
Commit
cbd5a453
authored
Feb 08, 2020
by
Paul B Mahol
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avfilter/vf_alphamerge: add timeline support
parent
a8d82cc2
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
1 deletion
+11
-1
vf_alphamerge.c
libavfilter/vf_alphamerge.c
+11
-1
No files found.
libavfilter/vf_alphamerge.c
View file @
cbd5a453
...
...
@@ -26,6 +26,7 @@
#include <string.h>
#include "libavutil/imgutils.h"
#include "libavutil/opt.h"
#include "libavutil/pixfmt.h"
#include "avfilter.h"
#include "drawutils.h"
...
...
@@ -154,7 +155,8 @@ static int activate(AVFilterContext *ctx)
}
if
(
s
->
main_frame
&&
s
->
alpha_frame
)
{
draw_frame
(
ctx
,
s
->
main_frame
,
s
->
alpha_frame
);
if
(
!
ctx
->
is_disabled
)
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
;
...
...
@@ -203,13 +205,21 @@ static const AVFilterPad alphamerge_outputs[] = {
{
NULL
}
};
static
const
AVOption
alphamerge_options
[]
=
{
{
NULL
}
};
AVFILTER_DEFINE_CLASS
(
alphamerge
);
AVFilter
ff_vf_alphamerge
=
{
.
name
=
"alphamerge"
,
.
description
=
NULL_IF_CONFIG_SMALL
(
"Copy the luma value of the second "
"input into the alpha channel of the first input."
),
.
priv_size
=
sizeof
(
AlphaMergeContext
),
.
priv_class
=
&
alphamerge_class
,
.
query_formats
=
query_formats
,
.
inputs
=
alphamerge_inputs
,
.
outputs
=
alphamerge_outputs
,
.
activate
=
activate
,
.
flags
=
AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL
,
};
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