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
e62587bc
Commit
e62587bc
authored
Mar 24, 2013
by
Clément Bœsch
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavfi/overlay: use standard options parsing.
parent
5dc074d3
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
11 deletions
+3
-11
vf_overlay.c
libavfilter/vf_overlay.c
+3
-11
No files found.
libavfilter/vf_overlay.c
View file @
e62587bc
...
...
@@ -119,15 +119,6 @@ AVFILTER_DEFINE_CLASS(overlay);
static
av_cold
int
init
(
AVFilterContext
*
ctx
,
const
char
*
args
)
{
OverlayContext
*
over
=
ctx
->
priv
;
static
const
char
*
shorthand
[]
=
{
"x"
,
"y"
,
NULL
};
int
ret
;
over
->
class
=
&
overlay_class
;
av_opt_set_defaults
(
over
);
ret
=
av_opt_set_from_string
(
over
,
args
,
shorthand
,
"="
,
":"
);
if
(
ret
<
0
)
return
ret
;
if
(
over
->
allow_packed_rgb
)
{
av_log
(
ctx
,
AV_LOG_WARNING
,
...
...
@@ -141,8 +132,6 @@ static av_cold void uninit(AVFilterContext *ctx)
{
OverlayContext
*
over
=
ctx
->
priv
;
av_opt_free
(
over
);
av_frame_free
(
&
over
->
overpicref
);
ff_bufqueue_discard_all
(
&
over
->
queue_main
);
ff_bufqueue_discard_all
(
&
over
->
queue_over
);
...
...
@@ -660,6 +649,8 @@ static const AVFilterPad avfilter_vf_overlay_outputs[] = {
{
NULL
}
};
static
const
char
*
const
shorthand
[]
=
{
"x"
,
"y"
,
NULL
};
AVFilter
avfilter_vf_overlay
=
{
.
name
=
"overlay"
,
.
description
=
NULL_IF_CONFIG_SMALL
(
"Overlay a video source on top of the input."
),
...
...
@@ -674,4 +665,5 @@ AVFilter avfilter_vf_overlay = {
.
inputs
=
avfilter_vf_overlay_inputs
,
.
outputs
=
avfilter_vf_overlay_outputs
,
.
priv_class
=
&
overlay_class
,
.
shorthand
=
shorthand
,
};
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