[SCM] libav/experimental: Pull out the ff_eval* from the mpegvideo header, as it doesn't belong there and put it in a separate file.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 4d7b4613a14ed7ae51d66de3ad39b32a3578284f
Author: Panagiotis Issaris <takis.issaris at uhasselt.be>
Date:   Fri Sep 29 19:33:04 2006 +0000

    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 f0977cd..14c4b39 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 f85b29f..248e68c 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 721edf9..cd0393e 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>

-- 
Libav/FFmpeg packaging