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/ratecontrol.c | |
| parent | 6532c6f9294722ccfa76717f94a9cbac37d7caed (diff) | |
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/ratecontrol.c')
| -rw-r--r-- | libavcodec/ratecontrol.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/ratecontrol.c b/libavcodec/ratecontrol.c index 375815a67f..4261678087 100644 --- a/libavcodec/ratecontrol.c +++ b/libavcodec/ratecontrol.c @@ -30,7 +30,7 @@ #include "dsputil.h" #include "ratecontrol.h" #include "mpegvideo.h" -#include "eval.h" +#include "libavutil/eval.h" #undef NDEBUG // Always check asserts, the speed effect is far too small to disable them. #include <assert.h> @@ -106,7 +106,7 @@ int ff_rate_control_init(MpegEncContext *s) }; emms_c(); - res = ff_parse_expr(&rcc->rc_eq_eval, s->avctx->rc_eq ? s->avctx->rc_eq : "tex^qComp", const_names, func1_names, func1, NULL, NULL, 0, s->avctx); + res = av_parse_expr(&rcc->rc_eq_eval, s->avctx->rc_eq ? s->avctx->rc_eq : "tex^qComp", const_names, func1_names, func1, NULL, NULL, 0, s->avctx); if (res < 0) { av_log(s->avctx, AV_LOG_ERROR, "Error parsing rc_eq \"%s\"\n", s->avctx->rc_eq); return res; @@ -254,7 +254,7 @@ void ff_rate_control_uninit(MpegEncContext *s) RateControlContext *rcc= &s->rc_context; emms_c(); - ff_free_expr(rcc->rc_eq_eval); + av_free_expr(rcc->rc_eq_eval); av_freep(&rcc->entry); #if CONFIG_LIBXVID @@ -338,7 +338,7 @@ static double get_qscale(MpegEncContext *s, RateControlEntry *rce, double rate_f 0 }; - bits= ff_eval_expr(rcc->rc_eq_eval, const_values, rce); + bits = av_eval_expr(rcc->rc_eq_eval, const_values, rce); if (isnan(bits)) { av_log(s->avctx, AV_LOG_ERROR, "Error evaluating rc_eq \"%s\"\n", s->avctx->rc_eq); return -1; |