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
f32fee57
Commit
f32fee57
authored
Mar 13, 2013
by
Clément Bœsch
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavfi/alphamerge: raise filter_frame() error.
parent
05854f55
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
4 deletions
+5
-4
vf_alphamerge.c
libavfilter/vf_alphamerge.c
+5
-4
No files found.
libavfilter/vf_alphamerge.c
View file @
f32fee57
...
@@ -131,12 +131,13 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *buf)
...
@@ -131,12 +131,13 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *buf)
AVFilterContext
*
ctx
=
inlink
->
dst
;
AVFilterContext
*
ctx
=
inlink
->
dst
;
AlphaMergeContext
*
merge
=
ctx
->
priv
;
AlphaMergeContext
*
merge
=
ctx
->
priv
;
int
ret
=
0
;
int
is_alpha
=
(
inlink
==
ctx
->
inputs
[
1
]);
int
is_alpha
=
(
inlink
==
ctx
->
inputs
[
1
]);
struct
FFBufQueue
*
queue
=
struct
FFBufQueue
*
queue
=
(
is_alpha
?
&
merge
->
queue_alpha
:
&
merge
->
queue_main
);
(
is_alpha
?
&
merge
->
queue_alpha
:
&
merge
->
queue_main
);
ff_bufqueue_add
(
ctx
,
queue
,
buf
);
ff_bufqueue_add
(
ctx
,
queue
,
buf
);
while
(
1
)
{
do
{
AVFrame
*
main_buf
,
*
alpha_buf
;
AVFrame
*
main_buf
,
*
alpha_buf
;
if
(
!
ff_bufqueue_peek
(
&
merge
->
queue_main
,
0
)
||
if
(
!
ff_bufqueue_peek
(
&
merge
->
queue_main
,
0
)
||
...
@@ -147,10 +148,10 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *buf)
...
@@ -147,10 +148,10 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *buf)
merge
->
frame_requested
=
0
;
merge
->
frame_requested
=
0
;
draw_frame
(
ctx
,
main_buf
,
alpha_buf
);
draw_frame
(
ctx
,
main_buf
,
alpha_buf
);
ff_filter_frame
(
ctx
->
outputs
[
0
],
main_buf
);
ret
=
ff_filter_frame
(
ctx
->
outputs
[
0
],
main_buf
);
av_frame_free
(
&
alpha_buf
);
av_frame_free
(
&
alpha_buf
);
}
}
while
(
ret
>=
0
);
return
0
;
return
ret
;
}
}
static
int
request_frame
(
AVFilterLink
*
outlink
)
static
int
request_frame
(
AVFilterLink
*
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