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
54b0c04a
Commit
54b0c04a
authored
Dec 15, 2012
by
Stefano Sabatini
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavfi/overlay: clarify/fix comment, add a few empty lines to ease readability
parent
3d1e2ada
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
1 deletion
+3
-1
vf_overlay.c
libavfilter/vf_overlay.c
+3
-1
No files found.
libavfilter/vf_overlay.c
View file @
54b0c04a
...
...
@@ -475,7 +475,7 @@ static int try_start_frame(AVFilterContext *ctx, AVFilterBufferRef *mainpic)
AVFilterBufferRef
*
next_overpic
,
*
outpicref
;
int
ret
;
/* Discard obsolete overlay frames: if there is a next
frame with pts i
s
/* Discard obsolete overlay frames: if there is a next
overlay frame with pt
s
* before the main frame, we can drop the current overlay. */
while
(
1
)
{
next_overpic
=
ff_bufqueue_peek
(
&
over
->
queue_over
,
0
);
...
...
@@ -486,12 +486,14 @@ static int try_start_frame(AVFilterContext *ctx, AVFilterBufferRef *mainpic)
avfilter_unref_buffer
(
over
->
overpicref
);
over
->
overpicref
=
next_overpic
;
}
/* If there is no next frame and no EOF and the overlay frame is before
* the main frame, we can not know yet if it will be superseded. */
if
(
!
over
->
queue_over
.
available
&&
!
over
->
overlay_eof
&&
(
!
over
->
overpicref
||
av_compare_ts
(
over
->
overpicref
->
pts
,
ctx
->
inputs
[
OVERLAY
]
->
time_base
,
mainpic
->
pts
,
ctx
->
inputs
[
MAIN
]
->
time_base
)
<
0
))
return
AVERROR
(
EAGAIN
);
/* At this point, we know that the current overlay frame extends to the
* time of the main frame. */
outlink
->
out_buf
=
outpicref
=
avfilter_ref_buffer
(
mainpic
,
~
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