Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Stefan Westerfeld
ffmpeg
Commits
516fb5e4
Commit
516fb5e4
authored
Apr 12, 2011
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavu: remove FF_API_OLD_EVAL_NAMES cruft
parent
3453a231
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
0 additions
and
68 deletions
+0
-68
avutil.h
libavutil/avutil.h
+0
-3
eval.c
libavutil/eval.c
+0
-32
eval.h
libavutil/eval.h
+0
-33
No files found.
libavutil/avutil.h
View file @
516fb5e4
...
...
@@ -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.
...
...
libavutil/eval.c
View file @
516fb5e4
...
...
@@ -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
[]
=
{
...
...
libavutil/eval.h
View file @
516fb5e4
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment