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

diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h
index f0977cd23c898540580ecacc727d4aa0ef589d4d..14c4b39d9a3d2ef0ce6f385e205cfb6b23332b84 100644 (file)
--- 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 f85b29f8abce324abdc08180e1a52de1de40c518..248e68c20075278d30dda67b7beeac5f4fc9f38a 100644 (file)
--- 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 721edf95a916a19d44c316eb5fc1a5b977962ca2..cd0393eab798d18d31fc14bacf94b4500fe523ca 100644 (file)
--- 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>