diff options
Diffstat (limited to 'libavutil/opt.c')
| -rw-r--r-- | libavutil/opt.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/libavutil/opt.c b/libavutil/opt.c index 0dd58a7f14..160da8d756 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -414,12 +414,21 @@ int av_opt_show2(void *obj, void *av_log_obj, int req_flags, int rej_flags) return 0; } +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_next_option(s, opt)) != NULL) { +#if FF_API_OLD_AVOPTIONS if ((opt->flags & mask) != flags) continue; +#endif switch (opt->type) { case FF_OPT_TYPE_CONST: /* Nothing to be done here */ @@ -461,11 +470,6 @@ void av_opt_set_defaults2(void *s, int mask, int flags) } } -void av_opt_set_defaults(void *s) -{ - av_opt_set_defaults2(s, 0, 0); -} - /** * Store the value in the field in ctx that is named like key. * ctx must be an AVClass context, storing is done using AVOptions. @@ -648,7 +652,7 @@ int main(void) }; test_ctx.class = &test_class; - av_opt_set_defaults2(&test_ctx, 0, 0); + av_opt_set_defaults(&test_ctx); test_ctx.string = av_strdup("default"); av_log_set_level(AV_LOG_DEBUG); |