diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-06-05 12:01:28 +0000 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-06-05 12:01:28 +0000 |
| commit | 0b99215c0e6a3e24dfdd99f83395e1231a015601 (patch) | |
| tree | 20a230f27fe44efb9f36fd3bb003306a3b6db7a1 /libavcodec/opt.c | |
| parent | 6532c6f9294722ccfa76717f94a9cbac37d7caed (diff) | |
| download | ffmpeg-streaming-0b99215c0e6a3e24dfdd99f83395e1231a015601.zip ffmpeg-streaming-0b99215c0e6a3e24dfdd99f83395e1231a015601.tar.gz | |
Move eval.c and eval.h from libavcodec to libavutil, and make the eval
API public.
Originally committed as revision 23485 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/opt.c')
| -rw-r--r-- | libavcodec/opt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/opt.c b/libavcodec/opt.c index 8473d90..128d95d 100644 --- a/libavcodec/opt.c +++ b/libavcodec/opt.c @@ -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 @@ int av_set_string3(void *obj, const char *name, const char *val, int alloc, cons 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; |
