diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-06-02 19:12:01 +0300 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-06-02 19:12:01 +0300 |
commit | 80be936a56199f7affddef546514604dcefcb763 (patch) | |
tree | ead37c819dad115446817aea7b78c53cee584735 /libmpcodecs/vf_qp.c | |
parent | ed1a1e28d89e9ab63e886adda18f0b8ccfec9356 (diff) | |
parent | 1cbf1ec46835300d1226068487b90476aff73ce8 (diff) | |
download | mpv-80be936a56199f7affddef546514604dcefcb763.tar.bz2 mpv-80be936a56199f7affddef546514604dcefcb763.tar.xz |
Merge svn changes up to r31303
Diffstat (limited to 'libmpcodecs/vf_qp.c')
-rw-r--r-- | libmpcodecs/vf_qp.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libmpcodecs/vf_qp.c b/libmpcodecs/vf_qp.c index fa25a4508f..d3ae638f8c 100644 --- a/libmpcodecs/vf_qp.c +++ b/libmpcodecs/vf_qp.c @@ -67,10 +67,11 @@ static int config(struct vf_instance *vf, NULL }; double temp_val; + int res; - temp_val= ff_parse_and_eval_expr(vf->priv->eq, const_names, const_values, NULL, NULL, NULL, NULL, NULL, 0, NULL); + res= ff_parse_and_eval_expr(&temp_val, vf->priv->eq, const_names, const_values, NULL, NULL, NULL, NULL, NULL, 0, NULL); - if (isnan(temp_val)){ + if (res < 0){ mp_msg(MSGT_VFILTER, MSGL_ERR, "qp: Error evaluating \"%s\" \n", vf->priv->eq); return 0; } |