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
5868e7f5
Commit
5868e7f5
authored
Oct 01, 2019
by
Paul B Mahol
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avfilter/vf_alphamere: use the name 's' for the pointer to the private context
This is shorter and consistent across filters.
parent
97450d2b
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
vf_alphamerge.c
libavfilter/vf_alphamerge.c
+6
-6
No files found.
libavfilter/vf_alphamerge.c
View file @
5868e7f5
...
...
@@ -77,9 +77,9 @@ fail:
static
int
config_input_main
(
AVFilterLink
*
inlink
)
{
AlphaMergeContext
*
merge
=
inlink
->
dst
->
priv
;
merge
->
is_packed_rgb
=
ff_fill_rgba_map
(
merge
->
rgba_map
,
inlink
->
format
)
>=
0
&&
AlphaMergeContext
*
s
=
inlink
->
dst
->
priv
;
s
->
is_packed_rgb
=
ff_fill_rgba_map
(
s
->
rgba_map
,
inlink
->
format
)
>=
0
&&
inlink
->
format
!=
AV_PIX_FMT_GBRAP
;
return
0
;
}
...
...
@@ -109,15 +109,15 @@ static void draw_frame(AVFilterContext *ctx,
AVFrame
*
main_buf
,
AVFrame
*
alpha_buf
)
{
AlphaMergeContext
*
merge
=
ctx
->
priv
;
AlphaMergeContext
*
s
=
ctx
->
priv
;
int
h
=
main_buf
->
height
;
if
(
merge
->
is_packed_rgb
)
{
if
(
s
->
is_packed_rgb
)
{
int
x
,
y
;
uint8_t
*
pin
,
*
pout
;
for
(
y
=
0
;
y
<
h
;
y
++
)
{
pin
=
alpha_buf
->
data
[
0
]
+
y
*
alpha_buf
->
linesize
[
0
];
pout
=
main_buf
->
data
[
0
]
+
y
*
main_buf
->
linesize
[
0
]
+
merge
->
rgba_map
[
A
];
pout
=
main_buf
->
data
[
0
]
+
y
*
main_buf
->
linesize
[
0
]
+
s
->
rgba_map
[
A
];
for
(
x
=
0
;
x
<
main_buf
->
width
;
x
++
)
{
*
pout
=
*
pin
;
pin
+=
1
;
...
...
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