Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Releases
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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Stefan Westerfeld
ffmpeg
Commits
559603da
Commit
559603da
authored
Oct 25, 2015
by
Nicolas George
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavfi/drawutils: add const to blending mask.
parent
bbd6bc6b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
5 deletions
+6
-5
drawutils.c
libavfilter/drawutils.c
+5
-4
drawutils.h
libavfilter/drawutils.h
+1
-1
No files found.
libavfilter/drawutils.c
View file @
559603da
...
...
@@ -408,7 +408,7 @@ void ff_blend_rectangle(FFDrawContext *draw, FFDrawColor *color,
}
static
void
blend_pixel
(
uint8_t
*
dst
,
unsigned
src
,
unsigned
alpha
,
uint8_t
*
mask
,
int
mask_linesize
,
int
l2depth
,
const
uint8_t
*
mask
,
int
mask_linesize
,
int
l2depth
,
unsigned
w
,
unsigned
h
,
unsigned
shift
,
unsigned
xm0
)
{
unsigned
xm
,
x
,
y
,
t
=
0
;
...
...
@@ -432,7 +432,7 @@ static void blend_pixel(uint8_t *dst, unsigned src, unsigned alpha,
static
void
blend_line_hv
(
uint8_t
*
dst
,
int
dst_delta
,
unsigned
src
,
unsigned
alpha
,
uint8_t
*
mask
,
int
mask_linesize
,
int
l2depth
,
int
w
,
const
uint8_t
*
mask
,
int
mask_linesize
,
int
l2depth
,
int
w
,
unsigned
hsub
,
unsigned
vsub
,
int
xm
,
int
left
,
int
right
,
int
hband
)
{
...
...
@@ -457,12 +457,13 @@ static void blend_line_hv(uint8_t *dst, int dst_delta,
void
ff_blend_mask
(
FFDrawContext
*
draw
,
FFDrawColor
*
color
,
uint8_t
*
dst
[],
int
dst_linesize
[],
int
dst_w
,
int
dst_h
,
uint8_t
*
mask
,
int
mask_linesize
,
int
mask_w
,
int
mask_h
,
const
uint8_t
*
mask
,
int
mask_linesize
,
int
mask_w
,
int
mask_h
,
int
l2depth
,
unsigned
endianness
,
int
x0
,
int
y0
)
{
unsigned
alpha
,
nb_planes
,
nb_comp
,
plane
,
comp
;
int
xm0
,
ym0
,
w_sub
,
h_sub
,
x_sub
,
y_sub
,
left
,
right
,
top
,
bottom
,
y
;
uint8_t
*
p0
,
*
p
,
*
m
;
uint8_t
*
p0
,
*
p
;
const
uint8_t
*
m
;
clip_interval
(
dst_w
,
&
x0
,
&
mask_w
,
&
xm0
);
clip_interval
(
dst_h
,
&
y0
,
&
mask_h
,
&
ym0
);
...
...
libavfilter/drawutils.h
View file @
559603da
...
...
@@ -130,7 +130,7 @@ void ff_blend_rectangle(FFDrawContext *draw, FFDrawColor *color,
*/
void
ff_blend_mask
(
FFDrawContext
*
draw
,
FFDrawColor
*
color
,
uint8_t
*
dst
[],
int
dst_linesize
[],
int
dst_w
,
int
dst_h
,
uint8_t
*
mask
,
int
mask_linesize
,
int
mask_w
,
int
mask_h
,
const
uint8_t
*
mask
,
int
mask_linesize
,
int
mask_w
,
int
mask_h
,
int
l2depth
,
unsigned
endianness
,
int
x0
,
int
y0
);
/**
...
...
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