diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-12 01:54:37 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-12 01:54:52 +0300 |
| commit | 1e16492b989e0f1bd262be6aaf5ebf7857f46dea (patch) | |
| tree | ab22e22e2fe64e0e847a1503ffb8fff4c32e3542 /libavutil/opt.h | |
| parent | 940f5c08e5125fd2ef235229aca504708ff282f0 (diff) | |
| parent | c6074a30ba3b5fb4319ee6ee599656d58548cdc8 (diff) | |
Merge commit 'c6074a30ba3b5fb4319ee6ee599656d58548cdc8'
* commit 'c6074a30ba3b5fb4319ee6ee599656d58548cdc8':
opt: Fix the documentation mentioning av_set_string3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/opt.h')
| -rw-r--r-- | libavutil/opt.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavutil/opt.h b/libavutil/opt.h index df5a62ec2a..39365ac957 100644 --- a/libavutil/opt.h +++ b/libavutil/opt.h @@ -456,7 +456,7 @@ void av_opt_set_defaults2(void *s, int mask, int flags); * @return the number of successfully set key/value pairs, or a negative * value corresponding to an AVERROR code in case of error: * AVERROR(EINVAL) if opts cannot be parsed, - * the error code issued by av_set_string3() if a key/value pair + * the error code issued by av_opt_set() if a key/value pair * cannot be set */ int av_set_options_string(void *ctx, const char *opts, @@ -633,7 +633,7 @@ int av_opt_eval_q (void *obj, const AVOption *o, const char *val, AVRational * was found. * * @note Options found with AV_OPT_SEARCH_CHILDREN flag may not be settable - * directly with av_set_string3(). Use special calls which take an options + * directly with av_opt_set(). Use special calls which take an options * AVDictionary (e.g. avformat_open_input()) to set options found with this * flag. */ |