From d9396facdc7edc90164bfaad2361d08a9d57919f Mon Sep 17 00:00:00 2001
From: cehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Tue, 1 Jun 2010 10:28:45 +0000
Subject: [PATCH] Fix compilation after FFmpeg r23402.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31299 b3059339-0415-0410-9bf9-f77b7e298cf2
---
libmpcodecs/vf_geq.c | 6 +++---
libmpcodecs/vf_qp.c | 5 +++--
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/libmpcodecs/vf_geq.c b/libmpcodecs/vf_geq.c
index 61e6d5cdf7..10e9e833b7 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;
}
diff --git a/libmpcodecs/vf_qp.c b/libmpcodecs/vf_qp.c
index cd933f1c3a..8e58e2abb0 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;
}