diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-05-30 15:42:42 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-05-30 15:51:33 +0300 |
| commit | e74361c48822accc0413cae6911efaf6bc7a2b5f (patch) | |
| tree | a851bbae7f1aac9a46f57877baa2ef72cf82487b /libmpcodecs | |
| parent | 1ffe8bece5922b344d750394a0fdd4e6e5794c82 (diff) | |
| parent | 0dd2ddd2bc71bb180811eae73ecc15c526520144 (diff) | |
| download | mpv-e74361c48822accc0413cae6911efaf6bc7a2b5f.tar.bz2 mpv-e74361c48822accc0413cae6911efaf6bc7a2b5f.tar.xz | |
Merge svn changes up to r31189
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/vf_geq.c | 6 | ||||
| -rw-r--r-- | libmpcodecs/vf_qp.c | 12 |
2 files changed, 11 insertions, 7 deletions
diff --git a/libmpcodecs/vf_geq.c b/libmpcodecs/vf_geq.c index 1b67b10203..46f449b811 100644 --- a/libmpcodecs/vf_geq.c +++ b/libmpcodecs/vf_geq.c @@ -178,11 +178,11 @@ static int vf_open(vf_instance_t *vf, char *args){ plane==0 ? lum : (plane==1 ? cb : cr), NULL }; - char * a; - vf->priv->e[plane] = ff_parse_expr(eq[plane], const_names, NULL, NULL, func2, func2_names, &a); + vf->priv->e[plane] = ff_parse_expr(eq[plane], const_names, NULL, NULL, func2_names, func2, 0, NULL); if (!vf->priv->e[plane]) { - mp_msg(MSGT_VFILTER, MSGL_ERR, "geq: error loading equation `%s': %s\n", eq[plane], a); + mp_msg(MSGT_VFILTER, MSGL_ERR, "geq: error loading equation `%s'\n", eq[plane]); + return 0; } } diff --git a/libmpcodecs/vf_qp.c b/libmpcodecs/vf_qp.c index f7e8b377fe..fa25a4508f 100644 --- a/libmpcodecs/vf_qp.c +++ b/libmpcodecs/vf_qp.c @@ -66,11 +66,15 @@ static int config(struct vf_instance *vf, "qp", NULL }; + double temp_val; - const char *error = NULL; - vf->priv->lut[i+129]= lrintf(ff_parse_and_eval_expr(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); + temp_val= ff_parse_and_eval_expr(vf->priv->eq, const_names, const_values, NULL, NULL, NULL, NULL, NULL, 0, NULL); + + if (isnan(temp_val)){ + mp_msg(MSGT_VFILTER, MSGL_ERR, "qp: Error evaluating \"%s\" \n", vf->priv->eq); + return 0; + } + vf->priv->lut[i+129]= lrintf(temp_val); } return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt); |