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_geq.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_geq.c')
| -rw-r--r-- | libmpcodecs/vf_geq.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libmpcodecs/vf_geq.c b/libmpcodecs/vf_geq.c index 46f449b811..55645492e4 100644 --- a/libmpcodecs/vf_geq.c +++ b/libmpcodecs/vf_geq.c @@ -137,7 +137,7 @@ static void uninit(struct vf_instance *vf){ //===========================================================================// static int vf_open(vf_instance_t *vf, char *args){ char eq[3][2000] = { { 0 }, { 0 }, { 0 } }; - int plane; + int plane, res; vf->config=config; vf->put_image=put_image; @@ -178,9 +178,9 @@ static int vf_open(vf_instance_t *vf, char *args){ plane==0 ? lum : (plane==1 ? cb : cr), NULL }; - vf->priv->e[plane] = ff_parse_expr(eq[plane], const_names, NULL, NULL, func2_names, func2, 0, NULL); + res = ff_parse_expr(&vf->priv->e[plane], eq[plane], const_names, NULL, NULL, func2_names, func2, 0, NULL); - if (!vf->priv->e[plane]) { + if (res < 0) { mp_msg(MSGT_VFILTER, MSGL_ERR, "geq: error loading equation `%s'\n", eq[plane]); return 0; } |