summaryrefslogtreecommitdiff
path: root/libavfilter/vf_geq.c
diff options
context:
space:
mode:
authorMarc-Antoine Arnaud <arnaud.marcantoine@gmail.com>2018-01-04 08:50:51 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2018-01-05 03:35:48 +0100
commite425047a47b68dd21d50f0d83cfd7ae816268f57 (patch)
tree08abf86839c4b82f0d2e230557c4845965685623 /libavfilter/vf_geq.c
parentac6b0bba79fe4de1281e0f2058646bee23d90224 (diff)
downloadffmpeg-e425047a47b68dd21d50f0d83cfd7ae816268f57.tar.gz
avfilter: rename variables in geq
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavfilter/vf_geq.c')
-rw-r--r--libavfilter/vf_geq.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/libavfilter/vf_geq.c b/libavfilter/vf_geq.c
index 0651ed0b36..2aa1259c9a 100644
--- a/libavfilter/vf_geq.c
+++ b/libavfilter/vf_geq.c
@@ -310,25 +310,25 @@ static int geq_filter_frame(AVFilterLink *inlink, AVFrame *in)
av_frame_copy_props(out, in);
for (plane = 0; plane < geq->planes && out->data[plane]; plane++) {
- const int w = (plane == 1 || plane == 2) ? AV_CEIL_RSHIFT(inlink->w, geq->hsub) : inlink->w;
- const int h = (plane == 1 || plane == 2) ? AV_CEIL_RSHIFT(inlink->h, geq->vsub) : inlink->h;
+ const int width = (plane == 1 || plane == 2) ? AV_CEIL_RSHIFT(inlink->w, geq->hsub) : inlink->w;
+ const int height = (plane == 1 || plane == 2) ? AV_CEIL_RSHIFT(inlink->h, geq->vsub) : inlink->h;
const int linesize = out->linesize[plane];
ThreadData td;
geq->dst = out->data[plane];
geq->dst16 = (uint16_t*)out->data[plane];
- geq->values[VAR_W] = w;
- geq->values[VAR_H] = h;
- geq->values[VAR_SW] = w / (double)inlink->w;
- geq->values[VAR_SH] = h / (double)inlink->h;
+ geq->values[VAR_W] = width;
+ geq->values[VAR_H] = height;
+ geq->values[VAR_SW] = width / (double)inlink->w;
+ geq->values[VAR_SH] = height / (double)inlink->h;
- td.width = w;
- td.height = h;
+ td.width = width;
+ td.height = height;
td.plane = plane;
td.linesize = linesize;
- ctx->internal->execute(ctx, slice_geq_filter, &td, NULL, FFMIN(h, nb_threads));
+ ctx->internal->execute(ctx, slice_geq_filter, &td, NULL, FFMIN(height, nb_threads));
}
av_frame_free(&geq->picref);