diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-09-10 23:59:08 +0300 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-09-10 23:59:08 +0300 |
commit | 259ea9d7034566760785fd5253f97b65ee8cd6ed (patch) | |
tree | 421140d6bf14e32f09acc4d0180d2273a9e88965 /libmpcodecs/vf_qp.c | |
parent | b56858342fdbe48489618107df75e5bd0451eb0b (diff) | |
parent | 60a3099c0db23d03b9f2501c2ef2cf35847b30a7 (diff) | |
download | mpv-259ea9d7034566760785fd5253f97b65ee8cd6ed.tar.bz2 mpv-259ea9d7034566760785fd5253f97b65ee8cd6ed.tar.xz |
Merge svn changes up to r27573
Conflicts:
libmpcodecs/vd_ffmpeg.c
Diffstat (limited to 'libmpcodecs/vf_qp.c')
-rw-r--r-- | libmpcodecs/vf_qp.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libmpcodecs/vf_qp.c b/libmpcodecs/vf_qp.c index c8605c76c5..b08a0d5523 100644 --- a/libmpcodecs/vf_qp.c +++ b/libmpcodecs/vf_qp.c @@ -75,7 +75,10 @@ static int config(struct vf_instance* vf, NULL }; - vf->priv->lut[i+129]= lrintf(ff_eval(vf->priv->eq, const_values, const_names, NULL, NULL, NULL, NULL, NULL)); + const char *error = NULL; + vf->priv->lut[i+129]= lrintf(ff_eval2(vf->priv->eq, const_values, const_names, NULL, NULL, NULL, NULL, NULL, &error)); + if (error) + mp_msg(MSGT_VFILTER, MSGL_ERR, "qp: Error evaluating \"%s\": %s\n", vf->priv->eq, error); } return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt); |