diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2015-08-16 19:40:48 -0400 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2015-08-18 13:09:06 -0400 |
| commit | 3285005347b2980fc078d4b5777844070bb6113b (patch) | |
| tree | e3f652f90ab037a8eeab6a66f7f6bf076d15ebf2 /libavutil | |
| parent | e3b7298aedd449ff71d445abda6617f2d841289a (diff) | |
| download | ffmpeg-3285005347b2980fc078d4b5777844070bb6113b.tar.gz | |
Undeprecate av_opt_set_defaults2().
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/opt.c | 5 | ||||
| -rw-r--r-- | libavutil/opt.h | 12 |
2 files changed, 10 insertions, 7 deletions
diff --git a/libavutil/opt.c b/libavutil/opt.c index 62db1b50b7..580586ea01 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -1177,20 +1177,17 @@ 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 av_opt_set_defaults2(s, 0, 0); } void av_opt_set_defaults2(void *s, int mask, int flags) { -#endif const AVOption *opt = NULL; while ((opt = av_opt_next(s, opt))) { void *dst = ((uint8_t*)s) + opt->offset; -#if FF_API_OLD_AVOPTIONS + if ((opt->flags & mask) != flags) continue; -#endif if (opt->flags & AV_OPT_FLAG_READONLY) continue; 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 |