summaryrefslogtreecommitdiffstats
path: root/libmpcodecs/vf_geq.c
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2010-05-30 15:42:42 +0300
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-05-30 15:51:33 +0300
commite74361c48822accc0413cae6911efaf6bc7a2b5f (patch)
treea851bbae7f1aac9a46f57877baa2ef72cf82487b /libmpcodecs/vf_geq.c
parent1ffe8bece5922b344d750394a0fdd4e6e5794c82 (diff)
parent0dd2ddd2bc71bb180811eae73ecc15c526520144 (diff)
downloadmpv-e74361c48822accc0413cae6911efaf6bc7a2b5f.tar.bz2
mpv-e74361c48822accc0413cae6911efaf6bc7a2b5f.tar.xz
Merge svn changes up to r31189
Diffstat (limited to 'libmpcodecs/vf_geq.c')
-rw-r--r--libmpcodecs/vf_geq.c6
1 files changed, 3 insertions, 3 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;
}
}