Signed-off-by: James Almer <jamr...@gmail.com>
---
libavutil/opt.c | 14 --------------
libavutil/opt.h | 19 -------------------
libavutil/version.h | 3 ---
3 files changed, 36 deletions(-)
diff --git a/libavutil/opt.c b/libavutil/opt.c
index ca4edb8..16828e2 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 4905ee3..1b72a10 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 de62b1d..3930763 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
--
1.8.5.5
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
