diff mbox series

[FFmpeg-devel,06/16] avfilter/vf_qp: Deduplicate variable names arrays

Message ID 20210104002816.2321974-6-andreas.rheinhardt@gmail.com
State Accepted
Commit a91b18f368d3c8a0c82fb6af7c31548f50bd28b2
Headers show
Series [FFmpeg-devel,01/16] avcodec/g723_1: Deduplicate arrays | expand

Checks

Context Check Description
andriy/x86_make success Make finished
andriy/x86_make_fate success Make fate finished
andriy/PPC64_make success Make finished
andriy/PPC64_make_fate success Make fate finished

Commit Message

Andreas Rheinhardt Jan. 4, 2021, 12:28 a.m. UTC 
This also avoids relocations.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
---
 libavfilter/vf_qp.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/libavfilter/vf_qp.c b/libavfilter/vf_qp.c
index af46fe0ece..e2d60fdbb5 100644
--- a/libavfilter/vf_qp.c
+++ b/libavfilter/vf_qp.c
@@ -38,6 +38,8 @@  typedef struct QPContext {
     int evaluate_per_mb;
 } QPContext;
 
+static const char *const var_names[] = { "known", "qp", "x", "y", "w", "h", NULL };
+
 #define OFFSET(x) offsetof(QPContext, x)
 #define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM
 
@@ -55,7 +57,6 @@  static int config_input(AVFilterLink *inlink)
     int i;
     int ret;
     AVExpr *e = NULL;
-    static const char *const var_names[] = { "known", "qp", "x", "y", "w", "h", NULL };
 
     if (!s->qp_expr_str)
         return 0;
@@ -144,7 +145,6 @@  static int filter_frame(AVFilterLink *inlink, AVFrame *in)
                 AVVideoBlockParams *b = av_video_enc_params_block(par_out, block_idx);
                 int qp = sd_in ? in_qp_global + BLOCK_QP_DELTA(block_idx) : NAN;
                 double var_values[] = { !!sd_in, qp, x, y, s->qstride, s->h, 0};
-                static const char *const var_names[] = { "known", "qp", "x", "y", "w", "h", NULL };
                 double temp_val;
 
                 ret = av_expr_parse_and_eval(&temp_val, s->qp_expr_str,