[FFmpeg-cvslog] lavu: remove FF_API_OLD_EVAL_NAMES cruft

Anton Khirnov git at videolan.org
Wed Apr 20 04:52:19 CEST 2011


ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Tue Apr 12 20:57:07 2011 +0200| [516fb5e40cf9d591914096be26ba56fc59294669] | committer: Anton Khirnov

lavu: remove FF_API_OLD_EVAL_NAMES cruft

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=516fb5e40cf9d591914096be26ba56fc59294669
---

 libavutil/avutil.h |    3 ---
 libavutil/eval.c   |   32 --------------------------------
 libavutil/eval.h   |   33 ---------------------------------
 3 files changed, 0 insertions(+), 68 deletions(-)

diff --git a/libavutil/avutil.h b/libavutil/avutil.h
index 6f2517c..edae38e 100644
--- a/libavutil/avutil.h
+++ b/libavutil/avutil.h
@@ -57,9 +57,6 @@
  * Those FF_API_* defines are not part of public API.
  * They may change, break or disappear at any time.
  */
-#ifndef FF_API_OLD_EVAL_NAMES
-#define FF_API_OLD_EVAL_NAMES (LIBAVUTIL_VERSION_MAJOR < 51)
-#endif
 
 /**
  * Return the LIBAVUTIL_VERSION_INT constant.
diff --git a/libavutil/eval.c b/libavutil/eval.c
index 7488a31..a6a59a3 100644
--- a/libavutil/eval.c
+++ b/libavutil/eval.c
@@ -530,38 +530,6 @@ int av_expr_parse_and_eval(double *d, const char *s,
     return isnan(*d) ? AVERROR(EINVAL) : 0;
 }
 
-#if FF_API_OLD_EVAL_NAMES
-int av_parse_expr(AVExpr **expr, const char *s,
-                  const char * const *const_names,
-                  const char * const *func1_names, double (* const *funcs1)(void *, double),
-                  const char * const *func2_names, double (* const *funcs2)(void *, double, double),
-                  int log_offset, void *log_ctx)
-{
-    return av_expr_parse(expr, s, const_names, func1_names, funcs1, func2_names, funcs2,
-                      log_offset, log_ctx);
-}
-
-double av_eval_expr(AVExpr *e, const double *const_values, void *opaque)
-{
-    return av_expr_eval(e, const_values, opaque);
-}
-
-int av_parse_and_eval_expr(double *res, const char *s,
-                           const char * const *const_names, const double *const_values,
-                           const char * const *func1_names, double (* const *funcs1)(void *, double),
-                           const char * const *func2_names, double (* const *funcs2)(void *, double, double),
-                           void *opaque, int log_offset, void *log_ctx)
-{
-    return av_expr_parse_and_eval(res, s, const_names, const_values, func1_names, funcs1, func2_names, funcs2,
-                                  opaque, log_offset, log_ctx);
-}
-
-void av_free_expr(AVExpr *e)
-{
-    av_expr_free(e);
-}
-#endif /* FF_API_OLD_EVAL_NAMES */
-
 #ifdef TEST
 #undef printf
 static double const_values[] = {
diff --git a/libavutil/eval.h b/libavutil/eval.h
index a20a006..c485c69 100644
--- a/libavutil/eval.h
+++ b/libavutil/eval.h
@@ -91,39 +91,6 @@ double av_expr_eval(AVExpr *e, const double *const_values, void *opaque);
  */
 void av_expr_free(AVExpr *e);
 
-#if FF_API_OLD_EVAL_NAMES
-/**
- * @deprecated Deprecated in favor of av_expr_parse_and_eval().
- */
-attribute_deprecated
-int av_parse_and_eval_expr(double *res, const char *s,
-                           const char * const *const_names, const double *const_values,
-                           const char * const *func1_names, double (* const *funcs1)(void *, double),
-                           const char * const *func2_names, double (* const *funcs2)(void *, double, double),
-                           void *opaque, int log_offset, void *log_ctx);
-
-/**
- * @deprecated Deprecated in favor of av_expr_parse().
- */
-attribute_deprecated
-int av_parse_expr(AVExpr **expr, const char *s,
-                  const char * const *const_names,
-                  const char * const *func1_names, double (* const *funcs1)(void *, double),
-                  const char * const *func2_names, double (* const *funcs2)(void *, double, double),
-                  int log_offset, void *log_ctx);
-/**
- * @deprecated Deprecated in favor of av_expr_eval().
- */
-attribute_deprecated
-double av_eval_expr(AVExpr *e, const double *const_values, void *opaque);
-
-/**
- * @deprecated Deprecated in favor of av_expr_free().
- */
-attribute_deprecated
-void av_free_expr(AVExpr *e);
-#endif /* FF_API_OLD_EVAL_NAMES */
-
 /**
  * Parse the string in numstr and return its value as a double. If
  * the string is empty, contains only whitespaces, or does not contain



More information about the ffmpeg-cvslog mailing list