diff options
| author | James Almer <jamrial@gmail.com> | 2014-09-14 21:15:33 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2014-10-05 17:09:53 -0300 |
| commit | 71718de814471b7ca871f600cd9368deb56b3972 (patch) | |
| tree | fda46500bd3e425ff36915cfbc700a9b7ffa46ab /libavutil | |
| parent | 1abb77285cff29eb00b766bdaa68fb4b757455aa (diff) | |
avutil: remove obsolete FF_API_FIND_OPT cruft
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/opt.c | 14 | ||||
| -rw-r--r-- | libavutil/opt.h | 19 | ||||
| -rw-r--r-- | libavutil/version.h | 3 |
3 files changed, 0 insertions, 36 deletions
diff --git a/libavutil/opt.c b/libavutil/opt.c index ee72a96471..6aabfe3137 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -40,20 +40,6 @@ #include <float.h> -#if FF_API_FIND_OPT -//FIXME order them and do a bin search -const AVOption *av_find_opt(void *v, const char *name, const char *unit, int mask, int flags) -{ - const AVOption *o = NULL; - - while ((o = av_next_option(v, o))) { - if (!strcmp(o->name, name) && (!unit || (o->unit && !strcmp(o->unit, unit))) && (o->flags & mask) == flags) - return o; - } - return NULL; -} -#endif - #if FF_API_OLD_AVOPTIONS const AVOption *av_next_option(void *obj, const AVOption *last) { diff --git a/libavutil/opt.h b/libavutil/opt.h index 4905ee30c0..1b72a105c9 100644 --- a/libavutil/opt.h +++ b/libavutil/opt.h @@ -378,25 +378,6 @@ typedef struct AVOptionRanges { } AVOptionRanges; -#if FF_API_FIND_OPT -/** - * Look for an option in obj. Look only for the options which - * have the flags set as specified in mask and flags (that is, - * for which it is the case that (opt->flags & mask) == flags). - * - * @param[in] obj a pointer to a struct whose first element is a - * pointer to an AVClass - * @param[in] name the name of the option to look for - * @param[in] unit the unit of the option to look for, or any if NULL - * @return a pointer to the option found, or NULL if no option - * has been found - * - * @deprecated use av_opt_find. - */ -attribute_deprecated -const AVOption *av_find_opt(void *obj, const char *name, const char *unit, int mask, int flags); -#endif - #if FF_API_OLD_AVOPTIONS /** * Set the field of obj with the given name to value. diff --git a/libavutil/version.h b/libavutil/version.h index f93798de2a..e38da7cf33 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -80,9 +80,6 @@ * @{ */ -#ifndef FF_API_FIND_OPT -#define FF_API_FIND_OPT (LIBAVUTIL_VERSION_MAJOR < 54) -#endif #ifndef FF_API_OLD_AVOPTIONS #define FF_API_OLD_AVOPTIONS (LIBAVUTIL_VERSION_MAJOR < 55) #endif |