summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-04-16 22:46:52 +0200
committerwm4 <wm4@nowhere>2015-04-16 22:46:52 +0200
commit00c18b32bf4f0b10dd2b83333f3ca219e2f5ca0a (patch)
treeab2cc2dc290e74ffaf457fefaa0df2ba2c6a5975
parente207c24b32a457859ab6e3a5b1f5f9eaeea36ed1 (diff)
downloadmpv-00c18b32bf4f0b10dd2b83333f3ca219e2f5ca0a.tar.bz2
mpv-00c18b32bf4f0b10dd2b83333f3ca219e2f5ca0a.tar.xz
vf_crop, vf_expand: remove ancient and useless messages
These are redundant.
-rw-r--r--video/filter/vf_crop.c7
-rw-r--r--video/filter/vf_expand.c13
2 files changed, 1 insertions, 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;
}