ffmpeg | branch: master | Paul B Mahol <onemda@gmail.com> | Tue Oct 1 13:17:43 2019 +0200| [5868e7f562fc49ebe8067392325b10a815e653fb] | committer: Paul B Mahol avfilter/vf_alphamere: use the name 's' for the pointer to the private context This is shorter and consistent across filters.

http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5868e7f562fc49ebe8...

libavfilter/vf_alphamerge.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libavfilter/vf_alphamerge.c b/libavfilter/vf_alphamerge.c index c5602b6227..eb5a4d6e78 100644 --- a/libavfilter/vf_alphamerge.c +++ b/libavfilter/vf_alphamerge.c @@ -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;