diff options
| author | Panagiotis Issaris <takis.issaris@uhasselt.be> | 2006-09-29 19:33:04 +0000 |
|---|---|---|
| committer | Panagiotis Issaris <takis.issaris@uhasselt.be> | 2006-09-29 19:33:04 +0000 |
| commit | 4d7b4613a14ed7ae51d66de3ad39b32a3578284f (patch) | |
| tree | bf5b930001f58d1285ca33818a6e85291ca8a273 | |
| parent | 3a6ccf4f3e3fc08e0dbb9079562cb3e01d19c662 (diff) | |
Pull out the ff_eval* from the mpegvideo header, as it doesn't belong there and
put it in a separate file.
Originally committed as revision 6383 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/mpegvideo.h | 10 | ||||
| -rw-r--r-- | libavcodec/opt.c | 2 | ||||
| -rw-r--r-- | libavcodec/ratecontrol.c | 1 |
3 files changed, 2 insertions, 11 deletions
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index f0977cd23c..14c4b39d9a 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -991,16 +991,6 @@ int ff_rate_control_init(MpegEncContext *s); float ff_rate_estimate_qscale(MpegEncContext *s, int dry_run); void ff_write_pass1_stats(MpegEncContext *s); void ff_rate_control_uninit(MpegEncContext *s); -#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) -double ff_eval(char *s, double *const_value, const char **const_name, - double (**func1)(void *, double), const char **func1_name, - double (**func2)(void *, double, double), char **func2_name, - void *opaque); -#endif -double ff_eval2(char *s, double *const_value, const char **const_name, - double (**func1)(void *, double), const char **func1_name, - double (**func2)(void *, double, double), char **func2_name, - void *opaque, char **error); int ff_vbv_update(MpegEncContext *s, int frame_size); void ff_get_2pass_fcode(MpegEncContext *s); diff --git a/libavcodec/opt.c b/libavcodec/opt.c index f85b29f8ab..248e68c200 100644 --- a/libavcodec/opt.c +++ b/libavcodec/opt.c @@ -26,7 +26,7 @@ #include "avcodec.h" #include "opt.h" -#include "mpegvideo.h" +#include "eval.h" //FIXME order them and do a bin search static AVOption *find_opt(void *v, const char *name, const char *unit){ diff --git a/libavcodec/ratecontrol.c b/libavcodec/ratecontrol.c index 721edf95a9..cd0393eab7 100644 --- a/libavcodec/ratecontrol.c +++ b/libavcodec/ratecontrol.c @@ -26,6 +26,7 @@ #include "avcodec.h" #include "dsputil.h" #include "mpegvideo.h" +#include "eval.h" #undef NDEBUG // allways check asserts, the speed effect is far too small to disable them #include <assert.h> |