har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avfilter/vf_alphamere: use the name 's' for the pointer to the private context

Browse Source 
This is shorter and consistent across filters.
This commit is contained in:
Paul B Mahol 2019-10-01 13:17:43 +02:00
parent 97450d2b6a
commit 5868e7f562
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavfilter/vf_alphamerge.c
View File

@ -77,9 +77,9 @@ fail:
static int config_input_main(AVFilterLink *inlink) static int config_input_main(AVFilterLink *inlink)
{ {
AlphaMergeContext *merge = inlink->dst->priv; AlphaMergeContext *s = inlink->dst->priv;
merge->is_packed_rgb = s->is_packed_rgb =
ff_fill_rgba_map(merge->rgba_map, inlink->format) >= 0 && ff_fill_rgba_map(s->rgba_map, inlink->format) >= 0 &&
inlink->format != AV_PIX_FMT_GBRAP; inlink->format != AV_PIX_FMT_GBRAP;
return 0; return 0;
} }
@ -109,15 +109,15 @@ static void draw_frame(AVFilterContext *ctx,
AVFrame *main_buf, AVFrame *main_buf,
AVFrame *alpha_buf) AVFrame *alpha_buf)
{ {
AlphaMergeContext *merge = ctx->priv; AlphaMergeContext *s = ctx->priv;
int h = main_buf->height; int h = main_buf->height;
if (merge->is_packed_rgb) { if (s->is_packed_rgb) {
int x, y; int x, y;
uint8_t *pin, *pout; uint8_t *pin, *pout;
for (y = 0; y < h; y++) { for (y = 0; y < h; y++) {
pin = alpha_buf->data[0] + y * alpha_buf->linesize[0]; 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++) { for (x = 0; x < main_buf->width; x++) {
*pout = *pin; *pout = *pin;
pin += 1; pin += 1;