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
d5f81779
Commit
d5f81779
authored
Jun 29, 2014
by
Clément Bœsch
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avfilter/overlay: reindent
parent
b18d1b09
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
15 deletions
+14
-15
vf_overlay.c
libavfilter/vf_overlay.c
+14
-15
No files found.
libavfilter/vf_overlay.c
View file @
d5f81779
...
...
@@ -554,21 +554,20 @@ static AVFrame *do_blend(AVFilterContext *ctx, AVFrame *mainpic,
OverlayContext
*
s
=
ctx
->
priv
;
AVFilterLink
*
inlink
=
ctx
->
inputs
[
0
];
/* TODO: reindent */
if
(
s
->
eval_mode
==
EVAL_MODE_FRAME
)
{
int64_t
pos
=
av_frame_get_pkt_pos
(
mainpic
);
s
->
var_values
[
VAR_N
]
=
inlink
->
frame_count
;
s
->
var_values
[
VAR_T
]
=
mainpic
->
pts
==
AV_NOPTS_VALUE
?
NAN
:
mainpic
->
pts
*
av_q2d
(
inlink
->
time_base
);
s
->
var_values
[
VAR_POS
]
=
pos
==
-
1
?
NAN
:
pos
;
eval_expr
(
ctx
);
av_log
(
ctx
,
AV_LOG_DEBUG
,
"n:%f t:%f pos:%f x:%f xi:%d y:%f yi:%d
\n
"
,
s
->
var_values
[
VAR_N
],
s
->
var_values
[
VAR_T
],
s
->
var_values
[
VAR_POS
],
s
->
var_values
[
VAR_X
],
s
->
x
,
s
->
var_values
[
VAR_Y
],
s
->
y
);
}
if
(
s
->
eval_mode
==
EVAL_MODE_FRAME
)
{
int64_t
pos
=
av_frame_get_pkt_pos
(
mainpic
);
s
->
var_values
[
VAR_N
]
=
inlink
->
frame_count
;
s
->
var_values
[
VAR_T
]
=
mainpic
->
pts
==
AV_NOPTS_VALUE
?
NAN
:
mainpic
->
pts
*
av_q2d
(
inlink
->
time_base
);
s
->
var_values
[
VAR_POS
]
=
pos
==
-
1
?
NAN
:
pos
;
eval_expr
(
ctx
);
av_log
(
ctx
,
AV_LOG_DEBUG
,
"n:%f t:%f pos:%f x:%f xi:%d y:%f yi:%d
\n
"
,
s
->
var_values
[
VAR_N
],
s
->
var_values
[
VAR_T
],
s
->
var_values
[
VAR_POS
],
s
->
var_values
[
VAR_X
],
s
->
x
,
s
->
var_values
[
VAR_Y
],
s
->
y
);
}
blend_image
(
ctx
,
mainpic
,
second
,
s
->
x
,
s
->
y
);
return
mainpic
;
...
...
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