RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'c6074a30ba3b5fb4319ee6ee599656d58548cdc8' 

* commit 'c6074a30ba3b5fb4319ee6ee599656d58548cdc8':
  opt: Fix the documentation mentioning av_set_string3

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-11-11 23:54:37 +01:00
parent 940f5c08e5 c6074a30ba
commit 1e16492b98
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavutil/opt.h
View File

@ -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 * @return the number of successfully set key/value pairs, or a negative
* value corresponding to an AVERROR code in case of error: * value corresponding to an AVERROR code in case of error:
* AVERROR(EINVAL) if opts cannot be parsed, * 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 * cannot be set
*/ */
int av_set_options_string(void *ctx, const char *opts, 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. * was found.
* *
* @note Options found with AV_OPT_SEARCH_CHILDREN flag may not be settable * @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 * AVDictionary (e.g. avformat_open_input()) to set options found with this
* flag. * flag.
*/ */