diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-05 17:56:28 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-05 17:56:28 +0200 |
| commit | 545559e43db5c55924bb9ecedf7465fa58f2f9a6 (patch) | |
| tree | 448e07c0e1aca2530ee0953a3d805e503203f393 | |
| parent | 2df52088ef5c4ce284af99775dfe7ad1fed03614 (diff) | |
| download | ffmpeg-545559e43db5c55924bb9ecedf7465fa58f2f9a6.tar.gz | |
Remove FF_CONST_AVUTIL55 cruft
| -rw-r--r-- | libavutil/opt.c | 6 | ||||
| -rw-r--r-- | libavutil/opt.h | 6 | ||||
| -rw-r--r-- | libavutil/version.h | 8 |
3 files changed, 6 insertions, 14 deletions
diff --git a/libavutil/opt.c b/libavutil/opt.c index 580586ea01..22e677576a 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -42,13 +42,13 @@ #include <float.h> #if FF_API_OLD_AVOPTIONS -const AVOption *av_next_option(FF_CONST_AVUTIL55 void *obj, const AVOption *last) +const AVOption *av_next_option(const void *obj, const AVOption *last) { return av_opt_next(obj, last); } #endif -const AVOption *av_opt_next(FF_CONST_AVUTIL55 void *obj, const AVOption *last) +const AVOption *av_opt_next(const void *obj, const AVOption *last) { const AVClass *class; if (!obj) @@ -1573,7 +1573,7 @@ static int opt_size(enum AVOptionType type) return 0; } -int av_opt_copy(void *dst, FF_CONST_AVUTIL55 void *src) +int av_opt_copy(void *dst, const void *src) { const AVOption *o = NULL; const AVClass *c; diff --git a/libavutil/opt.h b/libavutil/opt.h index 4f2b46e9d9..72e3a1cea9 100644 --- a/libavutil/opt.h +++ b/libavutil/opt.h @@ -420,7 +420,7 @@ AVRational av_get_q(void *obj, const char *name, const AVOption **o_out); attribute_deprecated int64_t av_get_int(void *obj, const char *name, const AVOption **o_out); attribute_deprecated const char *av_get_string(void *obj, const char *name, const AVOption **o_out, char *buf, int buf_len); -attribute_deprecated const AVOption *av_next_option(FF_CONST_AVUTIL55 void *obj, const AVOption *last); +attribute_deprecated const AVOption *av_next_option(const void *obj, const AVOption *last); #endif /** @@ -683,7 +683,7 @@ const AVOption *av_opt_find2(void *obj, const char *name, const char *unit, * or NULL * @return next AVOption or NULL */ -const AVOption *av_opt_next(FF_CONST_AVUTIL55 void *obj, const AVOption *prev); +const AVOption *av_opt_next(const void *obj, const AVOption *prev); /** * Iterate over AVOptions-enabled children of obj. @@ -835,7 +835,7 @@ int av_opt_query_ranges(AVOptionRanges **, void *obj, const char *key, int flags * @param src Object to copy into * @return 0 on success, negative on error */ -int av_opt_copy(void *dest, FF_CONST_AVUTIL55 void *src); +int av_opt_copy(void *dest, const void *src); /** * Get a default list of allowed ranges for the given option. diff --git a/libavutil/version.h b/libavutil/version.h index 0fd0d6f25a..233720f81e 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -115,14 +115,6 @@ #define FF_API_FRAME_QP (LIBAVUTIL_VERSION_MAJOR < 56) #endif -#ifndef FF_CONST_AVUTIL55 -#if LIBAVUTIL_VERSION_MAJOR >= 55 -#define FF_CONST_AVUTIL55 const -#else -#define FF_CONST_AVUTIL55 -#endif -#endif - /** * @} */ |