From 00c18b32bf4f0b10dd2b83333f3ca219e2f5ca0a Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Thu, 16 Apr 2015 22:46:52 +0200
Subject: vf_crop, vf_expand: remove ancient and useless messages

These are redundant.
---
 video/filter/vf_crop.c   |  7 +------
 video/filter/vf_expand.c | 13 -------------
 2 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/video/filter/vf_crop.c b/video/filter/vf_crop.c
index 498b2a9037..02787b8f22 100644
--- a/video/filter/vf_crop.c
+++ b/video/filter/vf_crop.c
@@ -58,7 +58,7 @@ static int config(struct vf_instance *vf,
     // check:
     if(vf->priv->crop_w+vf->priv->crop_x>width ||
        vf->priv->crop_h+vf->priv->crop_y>height){
-        MP_WARN(vf, "[CROP] Bad position/width/height - cropped area outside of the original!\n");
+        MP_WARN(vf, "Bad position/width/height - cropped area outside of the original!\n");
         return 0;
     }
     vf_rescale_dsize(&d_width, &d_height, width, height,
@@ -85,11 +85,6 @@ static int vf_open(vf_instance_t *vf){
     vf->config=config;
     vf->filter=filter;
     vf->query_format=query_format;
-    MP_INFO(vf, "Crop: %d x %d, %d ; %d\n",
-    vf->priv->crop_w,
-    vf->priv->crop_h,
-    vf->priv->crop_x,
-    vf->priv->crop_y);
     return 1;
 }
 
diff --git a/video/filter/vf_expand.c b/video/filter/vf_expand.c
index 44a8ec5767..6d5b694613 100644
--- a/video/filter/vf_expand.c
+++ b/video/filter/vf_expand.c
@@ -63,18 +63,12 @@ static int config(struct vf_instance *vf,
     vf->priv->exp_y = vf->priv->cfg_exp_y;
     vf->priv->exp_w = vf->priv->cfg_exp_w;
     vf->priv->exp_h = vf->priv->cfg_exp_h;
-    // calculate the missing parameters:
-#if 0
-    if(vf->priv->exp_w<width) vf->priv->exp_w=width;
-    if(vf->priv->exp_h<height) vf->priv->exp_h=height;
-#else
     if ( vf->priv->exp_w == -1 ) vf->priv->exp_w=width;
       else if (vf->priv->exp_w < -1 ) vf->priv->exp_w=width - vf->priv->exp_w;
         else if ( vf->priv->exp_w<width ) vf->priv->exp_w=width;
     if ( vf->priv->exp_h == -1 ) vf->priv->exp_h=height;
       else if ( vf->priv->exp_h < -1 ) vf->priv->exp_h=height - vf->priv->exp_h;
         else if( vf->priv->exp_h<height ) vf->priv->exp_h=height;
-#endif
     if (vf->priv->aspect) {
         float adjusted_aspect = vf->priv->aspect;
         adjusted_aspect *= ((double)width/height) / ((double)d_width/d_height);
@@ -149,13 +143,6 @@ static int vf_open(vf_instance_t *vf){
     vf->config=config;
     vf->query_format=query_format;
     vf->filter=filter;
-    MP_INFO(vf, "Expand: %d x %d, %d ; %d, aspect: %f, round: %d\n",
-    vf->priv->cfg_exp_w,
-    vf->priv->cfg_exp_h,
-    vf->priv->cfg_exp_x,
-    vf->priv->cfg_exp_y,
-    vf->priv->aspect,
-    vf->priv->round);
     return 1;
 }
 
-- 
cgit v1.2.3