RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix compilation after FFmpeg r23485. 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31322 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
cehoyos 2010-06-05 13:44:20 +00:00
parent 7b50ebd44b
commit ef14d50ad6
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libmpcodecs/vf_geq.c
View File

@ -34,7 +34,7 @@
#include "vf.h"
#include "libavcodec/avcodec.h"
#include "libavcodec/eval.h"
#include "libavutil/eval.h"
struct vf_priv_s {
AVExpr * e[3];
@ -116,7 +116,7 @@ static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){
const_values[3]=y;
for(x=0; x<w; x++){
const_values[2]=x;
dst[x + y * dst_stride] = ff_eval_expr(vf->priv->e[plane],
dst[x + y * dst_stride] = av_eval_expr(vf->priv->e[plane],
const_values, vf);
}
}
@ -178,7 +178,7 @@ static int vf_open(vf_instance_t *vf, char *args){
plane==0 ? lum : (plane==1 ? cb : cr),
NULL
};
res = ff_parse_expr(&vf->priv->e[plane], eq[plane], const_names, NULL, NULL, func2_names, func2, 0, NULL);
res = av_parse_expr(&vf->priv->e[plane], eq[plane], const_names, NULL, NULL, func2_names, func2, 0, NULL);
if (res < 0) {
mp_msg(MSGT_VFILTER, MSGL_ERR, "geq: error loading equation `%s'\n", eq[plane]);

4
libmpcodecs/vf_qp.c
View File

@ -32,7 +32,7 @@
#include "libvo/fastmemcpy.h"
#include "libavcodec/avcodec.h"
#include "libavcodec/eval.h"
#include "libavutil/eval.h"
struct vf_priv_s {
@ -69,7 +69,7 @@ static int config(struct vf_instance *vf,
double temp_val;
int res;
res= ff_parse_and_eval_expr(&temp_val, vf->priv->eq, const_names, const_values, NULL, NULL, NULL, NULL, NULL, 0, NULL);
res= av_parse_and_eval_expr(&temp_val, vf->priv->eq, const_names, const_values, NULL, NULL, NULL, NULL, NULL, 0, NULL);
if (res < 0){
mp_msg(MSGT_VFILTER, MSGL_ERR, "qp: Error evaluating \"%s\" \n", vf->priv->eq);