summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-07-20 21:16:37 +0200
committerwm4 <wm4@nowhere>2015-07-20 21:16:37 +0200
commite5fac76b3bd0df964cb39eba525f56721e57a5b2 (patch)
tree1f4a2fb320385b4e77210d1c7d66298e46fef2b3 /video
parent4a1657da01da373332f484d26441835975bb4e4b (diff)
downloadmpv-e5fac76b3bd0df964cb39eba525f56721e57a5b2.tar.bz2
mpv-e5fac76b3bd0df964cb39eba525f56721e57a5b2.tar.xz
vf_scale: cleanup log messages
In particular, get rid of the EUSERBROKEN message.
Diffstat (limited to 'video')
-rw-r--r--video/filter/vf_scale.c15
1 files changed, 3 insertions, 12 deletions
diff --git a/video/filter/vf_scale.c b/video/filter/vf_scale.c
index 29d7376e93..a71f2c1038 100644
--- a/video/filter/vf_scale.c
+++ b/video/filter/vf_scale.c
@@ -81,7 +81,7 @@ static int reconfig(struct vf_instance *vf, struct mp_image_params *in,
int round_w = 0, round_h = 0;
if (!best) {
- MP_WARN(vf, "SwScale: no supported outfmt found :(\n");
+ MP_WARN(vf, "no supported output format found\n");
return -1;
}
@@ -102,10 +102,7 @@ static int reconfig(struct vf_instance *vf, struct mp_image_params *in,
if (vf->priv->w < -3 || vf->priv->h < -3 ||
(vf->priv->w < -1 && vf->priv->h < -1))
{
- // TODO: establish a direct connection to the user's brain
- // and find out what the heck he thinks MPlayer should do
- // with this nonsense.
- MP_ERR(vf, "SwScale: EUSERBROKEN Check your parameters, they make no sense!\n");
+ MP_ERR(vf, "invalid parameters\n");
return -1;
}
@@ -142,9 +139,7 @@ static int reconfig(struct vf_instance *vf, struct mp_image_params *in,
}
}
- MP_DBG(vf, "SwScale: scaling %dx%d %s to %dx%d %s \n",
- width, height, vo_format_name(in->imgfmt), vf->priv->w, vf->priv->h,
- vo_format_name(best));
+ MP_DBG(vf, "scaling %dx%d to %dx%d\n", width, height, vf->priv->w, vf->priv->h);
// Compute new d_width and d_height, preserving aspect
// while ensuring that both are >= output size in pixels.
@@ -241,10 +236,6 @@ static int vf_open(vf_instance_t *vf)
vf->priv->sws->log = vf->log;
vf->priv->sws->params[0] = vf->priv->param[0];
vf->priv->sws->params[1] = vf->priv->param[1];
-
- MP_VERBOSE(vf, "SwScale params: %d x %d (-1=no scaling)\n",
- vf->priv->cfg_w, vf->priv->cfg_h);
-
return 1;
}