diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-09-07 22:32:59 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-09-07 22:58:39 +0200 |
commit | f1b5693027d48a9e448f21595fb9247893c225cf (patch) | |
tree | d01e1b5a8a3abe464cd5be4d86122f0818b60132 /libavutil/opt.h | |
parent | a2b66a366d7d9d7dacc217601b5e4406624f91ea (diff) | |
parent | 0ca36b4de76e10578e23199c2932682c0f510e31 (diff) | |
download | ffmpeg-streaming-f1b5693027d48a9e448f21595fb9247893c225cf.zip ffmpeg-streaming-f1b5693027d48a9e448f21595fb9247893c225cf.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Add LATM muxer
v210enc: clip values according to specifications
v210enc: switch to PIX_FMT_422P10
v210dec: switch to PIX_FMT_422P10
AVOptions: remove AVOption.offset <= 0 checks
AVOptions: deprecate av_opt_set_defaults2
AVOptions: move doxy for av_opt_set_defaults() from opt.c to opt.h
libx264: fix setting some more parameters
libx264: fix setting the H.264 level
libx264: add 'direct-pred' private option
libx264: add 'partitions' private option
Conflicts:
Changelog
libavcodec/Makefile
libavcodec/libx264.c
libavcodec/v210enc.c
libavfilter/src_movie.c
libavformat/version.h
libavutil/opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/opt.h')
-rw-r--r-- | libavutil/opt.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/libavutil/opt.h b/libavutil/opt.h index efb4408..95ce12c 100644 --- 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 |