RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

vf_scale: cleanup log messages 

In particular, get rid of the EUSERBROKEN message.
This commit is contained in:
wm4 2015-07-20 21:16:37 +02:00
parent 4a1657da01
commit e5fac76b3b
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
video/filter/vf_scale.c
View File

@ -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;
}