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
a45e96a5
Commit
a45e96a5
authored
Oct 02, 2015
by
Nicolas George
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavfi/vf_alphamerge: remove looping on request_frame().
parent
8a2e2fc3
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
5 deletions
+1
-5
vf_alphamerge.c
libavfilter/vf_alphamerge.c
+1
-5
No files found.
libavfilter/vf_alphamerge.c
View file @
a45e96a5
...
...
@@ -36,7 +36,6 @@
enum
{
Y
,
U
,
V
,
A
};
typedef
struct
{
int
frame_requested
;
int
is_packed_rgb
;
uint8_t
rgba_map
[
4
];
struct
FFBufQueue
queue_main
;
...
...
@@ -146,7 +145,6 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *buf)
main_buf
=
ff_bufqueue_get
(
&
merge
->
queue_main
);
alpha_buf
=
ff_bufqueue_get
(
&
merge
->
queue_alpha
);
merge
->
frame_requested
=
0
;
draw_frame
(
ctx
,
main_buf
,
alpha_buf
);
ret
=
ff_filter_frame
(
ctx
->
outputs
[
0
],
main_buf
);
av_frame_free
(
&
alpha_buf
);
...
...
@@ -160,13 +158,11 @@ static int request_frame(AVFilterLink *outlink)
AlphaMergeContext
*
merge
=
ctx
->
priv
;
int
in
,
ret
;
merge
->
frame_requested
=
1
;
while
(
merge
->
frame_requested
)
{
/* TODO reindent */
in
=
ff_bufqueue_peek
(
&
merge
->
queue_main
,
0
)
?
1
:
0
;
ret
=
ff_request_frame
(
ctx
->
inputs
[
in
]);
if
(
ret
<
0
)
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