From 66093e216580b5edf9b95b23d0055d759a9e2e34 Mon Sep 17 00:00:00 2001 From: Marc-Antoine Arnaud Date: Thu, 30 Nov 2017 10:31:38 +0100 Subject: [PATCH 1/2] avfilter: reorder variable definition in geq Content-Type: text/x-patch; charset="utf-8" --- libavfilter/vf_geq.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavfilter/vf_geq.c b/libavfilter/vf_geq.c index 36dbd421ce..0bd81fd586 100644 --- a/libavfilter/vf_geq.c +++ b/libavfilter/vf_geq.c @@ -33,6 +33,9 @@ #include "libavutil/pixdesc.h" #include "internal.h" +static const char *const var_names[] = { "X", "Y", "W", "H", "N", "SW", "SH", "T", NULL }; +enum { VAR_X, VAR_Y, VAR_W, VAR_H, VAR_N, VAR_SW, VAR_SH, VAR_T, VAR_VARS_NB }; + typedef struct GEQContext { const AVClass *class; AVExpr *e[4]; ///< expressions for each plane @@ -107,9 +110,6 @@ static double cb(void *priv, double x, double y) { return getpix(priv, x, y, 1) static double cr(void *priv, double x, double y) { return getpix(priv, x, y, 2); } static double alpha(void *priv, double x, double y) { return getpix(priv, x, y, 3); } -static const char *const var_names[] = { "X", "Y", "W", "H", "N", "SW", "SH", "T", NULL }; -enum { VAR_X, VAR_Y, VAR_W, VAR_H, VAR_N, VAR_SW, VAR_SH, VAR_T, VAR_VARS_NB }; - static av_cold int geq_init(AVFilterContext *ctx) { GEQContext *geq = ctx->priv; -- 2.15.0