Merge remote-tracking branch 'qatar/master'

[coroid/ffmpeg_saccubus.git] / libavutil / opt.h

diff --git a/libavutil/opt.h b/libavutil/opt.h
index efb4408..95ce12c 100644 (file)
--- a/libavutil/opt.h
+++ b/libavutil/opt.h
@@ -160,8 +160,17 @@ const AVOption *av_next_option(void *obj, const AVOption *last);
  */
 int av_opt_show2(void *obj, void *av_log_obj, int req_flags, int rej_flags);
 
+/**
+ * Set the values of all AVOption fields to their default values.
+ *
+ * @param s an AVOption-enabled struct (its first member must be a pointer to AVClass)
+ */
 void av_opt_set_defaults(void *s);
+
+#if FF_API_OLD_AVOPTIONS
+attribute_deprecated
 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