diff opt.c @ 11832:e522dbf60abd libavcodec

Move eval.c and eval.h from libavcodec to libavutil, and make the eval API public.
author stefano
date Sat, 05 Jun 2010 12:01:28 +0000
parents 026edf66e3a9
children 7220936dc29c
line wrap: on
line diff
--- a/opt.c	Fri Jun 04 23:33:36 2010 +0000
+++ b/opt.c	Sat Jun 05 12:01:28 2010 +0000
@@ -27,7 +27,7 @@
 
 #include "avcodec.h"
 #include "opt.h"
-#include "eval.h"
+#include "libavutil/eval.h"
 
 //FIXME order them and do a bin search
 const AVOption *av_find_opt(void *v, const char *name, const char *unit, int mask, int flags){
@@ -165,7 +165,7 @@
                 else if(!strcmp(buf, "none"   )) d= 0;
                 else if(!strcmp(buf, "all"    )) d= ~0;
                 else {
-                    int res = ff_parse_and_eval_expr(&d, buf, const_names, const_values, NULL, NULL, NULL, NULL, NULL, 0, obj);
+                    int res = av_parse_and_eval_expr(&d, buf, const_names, const_values, NULL, NULL, NULL, NULL, NULL, 0, obj);
                     if (res < 0) {
                         av_log(obj, AV_LOG_ERROR, "Unable to parse option value \"%s\"\n", val);
                         return res;