Merge commit 'a16854892c3af945d3ab0015699a0c9884f0a89a'

[ffmpeg] / libavfilter / vf_eq.c

diff --git a/libavfilter/vf_eq.c b/libavfilter/vf_eq.c
index f8b816038d34e039d6baf2d67d8f15afde03b359..1519d3d5693dc8b1ad75e9e8480649479d35ae9e 100644 (file)
--- a/libavfilter/vf_eq.c
+++ b/libavfilter/vf_eq.c
@@ -98,7 +98,7 @@ static void check_values(EQParameters *param, EQContext *eq)
 {
     if (param->contrast == 1.0 && param->brightness == 0.0 && param->gamma == 1.0)
         param->adjust = NULL;
-    else if (param->gamma == 1.0)
+    else if (param->gamma == 1.0 && fabs(param->contrast) < 7.9)
         param->adjust = eq->process;
     else
         param->adjust = apply_lut;
@@ -106,7 +106,7 @@ static void check_values(EQParameters *param, EQContext *eq)
 
 static void set_contrast(EQContext *eq)
 {
-    eq->contrast = av_clipf(av_expr_eval(eq->contrast_pexpr, eq->var_values, eq), -2.0, 2.0);
+    eq->contrast = av_clipf(av_expr_eval(eq->contrast_pexpr, eq->var_values, eq), -1000.0, 1000.0);
     eq->param[0].contrast = eq->contrast;
     eq->param[0].lut_clean = 0;
     check_values(&eq->param[0], eq);