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
b2453001
Commit
b2453001
authored
May 14, 2013
by
Paul B Mahol
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavfi/blend: timeline support
Signed-off-by:
Paul B Mahol
<
onemda@gmail.com
>
parent
e751481c
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
5 deletions
+11
-5
vf_blend.c
libavfilter/vf_blend.c
+11
-5
No files found.
libavfilter/vf_blend.c
View file @
b2453001
...
...
@@ -412,14 +412,19 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *buf)
top_buf
=
ff_bufqueue_get
(
&
b
->
queue_top
);
bottom_buf
=
ff_bufqueue_get
(
&
b
->
queue_bottom
);
if
(
!
ctx
->
is_disabled
)
{
out_buf
=
ff_get_video_buffer
(
outlink
,
outlink
->
w
,
outlink
->
h
);
if
(
!
out_buf
)
{
if
(
!
out_buf
)
return
AVERROR
(
ENOMEM
);
}
av_frame_copy_props
(
out_buf
,
top_buf
);
blend_frame
(
ctx
,
top_buf
,
bottom_buf
,
out_buf
);
}
else
{
out_buf
=
av_frame_clone
(
top_buf
);
if
(
!
out_buf
)
return
AVERROR
(
ENOMEM
);
}
b
->
frame_requested
=
0
;
blend_frame
(
ctx
,
top_buf
,
bottom_buf
,
out_buf
);
ret
=
ff_filter_frame
(
outlink
,
out_buf
);
av_frame_free
(
&
top_buf
);
av_frame_free
(
&
bottom_buf
);
...
...
@@ -460,4 +465,5 @@ AVFilter avfilter_vf_blend = {
.
inputs
=
blend_inputs
,
.
outputs
=
blend_outputs
,
.
priv_class
=
&
blend_class
,
.
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