summaryrefslogtreecommitdiff
path: root/libavutil
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2011-09-04 11:39:49 +0200
committerAnton Khirnov <anton@khirnov.net>2011-09-07 11:16:52 +0200
commita7e2b2ccc9e184820f13894de6cb7e49abcb6130 (patch)
tree7cf6c794805aa5e4ef1e1189a7d4604263d17336 /libavutil
parent0962f23b35ec6aa497f8338a7ddc2d82fda0a400 (diff)
AVOptions: move doxy for av_opt_set_defaults() from opt.c to opt.h
Also change it to be more readable.
Diffstat (limited to 'libavutil')
-rw-r--r--libavutil/opt.c6
-rw-r--r--libavutil/opt.h5
2 files changed, 5 insertions, 6 deletions
diff --git a/libavutil/opt.c b/libavutil/opt.c
index 707977a7a9..0dd58a7f14 100644
--- a/libavutil/opt.c
+++ b/libavutil/opt.c
@@ -414,12 +414,6 @@ int av_opt_show2(void *obj, void *av_log_obj, int req_flags, int rej_flags)
return 0;
}
-/** Set the values of the AVCodecContext or AVFormatContext structure.
- * They are set to the defaults specified in the according AVOption options
- * array default_val field.
- *
- * @param s AVCodecContext or AVFormatContext for which the defaults will be set
- */
void av_opt_set_defaults2(void *s, int mask, int flags)
{
const AVOption *opt = NULL;
diff --git a/libavutil/opt.h b/libavutil/opt.h
index 68d2c798e2..f8eea6bc2a 100644
--- a/libavutil/opt.h
+++ b/libavutil/opt.h
@@ -160,6 +160,11 @@ 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);
void av_opt_set_defaults2(void *s, int mask, int flags);