Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRonald S. Bultje <rsbultje@gmail.com>2015-08-17 02:40:48 +0300
committerRonald S. Bultje <rsbultje@gmail.com>2015-08-18 20:09:06 +0300
commit3285005347b2980fc078d4b5777844070bb6113b (patch)
treee3f652f90ab037a8eeab6a66f7f6bf076d15ebf2 /libavutil/opt.h
parente3b7298aedd449ff71d445abda6617f2d841289a (diff)
Undeprecate av_opt_set_defaults2().
Diffstat (limited to 'libavutil/opt.h')
-rw-r--r--libavutil/opt.h12
1 files changed, 9 insertions, 3 deletions
diff --git a/libavutil/opt.h b/libavutil/opt.h
index 481d096a1b..4f2b46e9d9 100644
--- a/libavutil/opt.h
+++ b/libavutil/opt.h
@@ -441,10 +441,16 @@ int av_opt_show2(void *obj, void *av_log_obj, int req_flags, int rej_flags);
*/
void av_opt_set_defaults(void *s);
-#if FF_API_OLD_AVOPTIONS
-attribute_deprecated
+/**
+ * Set the values of all AVOption fields to their default values. Only these
+ * AVOption fields for which (opt->flags & mask) == flags will have their
+ * default applied to s.
+ *
+ * @param s an AVOption-enabled struct (its first member must be a pointer to AVClass)
+ * @param mask combination of AV_OPT_FLAG_*
+ * @param flags combination of AV_OPT_FLAG_*
+ */
void av_opt_set_defaults2(void *s, int mask, int flags);
-#endif
/**
* Parse the key/value pairs list in opts. For each key/value pair