generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lavu: remove disabled FF_API_OLD_EVAL_NAMES code

Browse Source
This commit is contained in:
Stefano Sabatini 2012-11-04 12:01:22 +01:00
parent ef4dc3e55b
commit 1c6962dc20
3 changed files with 0 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
libavutil/eval.c
View File

@ -659,40 +659,6 @@ int av_expr_parse_and_eval(double *d, const char *s,
return isnan(*d) ? AVERROR(EINVAL) : 0; return isnan(*d) ? AVERROR(EINVAL) : 0;
} }
#if FF_API_OLD_EVAL_NAMES
// LCOV_EXCL_START
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);
}
// LCOV_EXCL_STOP
#endif /* FF_API_OLD_EVAL_NAMES */
#ifdef TEST #ifdef TEST
// LCOV_EXCL_START // LCOV_EXCL_START
#undef printf #undef printf

33
libavutil/eval.h
View File

@ -91,39 +91,6 @@ double av_expr_eval(AVExpr *e, const double *const_values, void *opaque);
*/ */
void av_expr_free(AVExpr *e); 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 * Parse the string in numstr and return its value as a double. If
* the string is empty, contains only whitespaces, or does not contain * the string is empty, contains only whitespaces, or does not contain

3
libavutil/version.h
View File

@ -99,9 +99,6 @@
* @{ * @{
*/ */
#ifndef FF_API_OLD_EVAL_NAMES
#define FF_API_OLD_EVAL_NAMES (LIBAVUTIL_VERSION_MAJOR < 52)
#endif
#ifndef FF_API_GET_BITS_PER_SAMPLE_FMT #ifndef FF_API_GET_BITS_PER_SAMPLE_FMT
#define FF_API_GET_BITS_PER_SAMPLE_FMT (LIBAVUTIL_VERSION_MAJOR < 53) #define FF_API_GET_BITS_PER_SAMPLE_FMT (LIBAVUTIL_VERSION_MAJOR < 53)
#endif #endif