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
92a2d12a
Commit
92a2d12a
authored
May 27, 2013
by
Clément Bœsch
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavfi/overlay: remove do_blend forward declaration.
parent
ae573824
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
16 deletions
+13
-16
vf_overlay.c
libavfilter/vf_overlay.c
+13
-16
No files found.
libavfilter/vf_overlay.c
View file @
92a2d12a
...
@@ -107,22 +107,6 @@ typedef struct {
...
@@ -107,22 +107,6 @@ typedef struct {
AVExpr
*
x_pexpr
,
*
y_pexpr
;
AVExpr
*
x_pexpr
,
*
y_pexpr
;
}
OverlayContext
;
}
OverlayContext
;
// TODO: remove forward declaration
static
AVFrame
*
do_blend
(
AVFilterContext
*
ctx
,
AVFrame
*
mainpic
,
const
AVFrame
*
second
);
static
av_cold
int
init
(
AVFilterContext
*
ctx
)
{
OverlayContext
*
s
=
ctx
->
priv
;
if
(
s
->
allow_packed_rgb
)
{
av_log
(
ctx
,
AV_LOG_WARNING
,
"The rgb option is deprecated and is overriding the format option, use format instead
\n
"
);
s
->
format
=
OVERLAY_FORMAT_RGB
;
}
s
->
dinput
.
process
=
do_blend
;
return
0
;
}
static
av_cold
void
uninit
(
AVFilterContext
*
ctx
)
static
av_cold
void
uninit
(
AVFilterContext
*
ctx
)
{
{
OverlayContext
*
s
=
ctx
->
priv
;
OverlayContext
*
s
=
ctx
->
priv
;
...
@@ -579,6 +563,19 @@ static int request_frame(AVFilterLink *outlink)
...
@@ -579,6 +563,19 @@ static int request_frame(AVFilterLink *outlink)
return
ff_dualinput_request_frame
(
&
s
->
dinput
,
outlink
);
return
ff_dualinput_request_frame
(
&
s
->
dinput
,
outlink
);
}
}
static
av_cold
int
init
(
AVFilterContext
*
ctx
)
{
OverlayContext
*
s
=
ctx
->
priv
;
if
(
s
->
allow_packed_rgb
)
{
av_log
(
ctx
,
AV_LOG_WARNING
,
"The rgb option is deprecated and is overriding the format option, use format instead
\n
"
);
s
->
format
=
OVERLAY_FORMAT_RGB
;
}
s
->
dinput
.
process
=
do_blend
;
return
0
;
}
#define OFFSET(x) offsetof(OverlayContext, x)
#define OFFSET(x) offsetof(OverlayContext, x)
#define FLAGS AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_FILTERING_PARAM
#define FLAGS AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_FILTERING_PARAM
...
...
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