av_set_string3().
Originally committed as revision 16241 to svn://svn.ffmpeg.org/ffmpeg/trunk
const char *str= av_get_string(opts_ctx, opt_names[i], &opt, buf, sizeof(buf));
/* if an option with name opt_names[i] is present in opts_ctx then str is non-NULL */
if(str && ((opt->flags & flags) == flags))
- av_set_string2(ctx, opt_names[i], str, 1);
+ av_set_string3(ctx, opt_names[i], str, 1, NULL);
}
}
static int ffserver_opt_default(const char *opt, const char *arg,
AVCodecContext *avctx, int type)
{
- const AVOption *o = NULL;
+ int ret = 0;
const AVOption *o2 = av_find_opt(avctx, opt, NULL, type, type);
if(o2)
- o = av_set_string2(avctx, opt, arg, 1);
- if(!o)
- return -1;
- return 0;
+ ret = av_set_string3(avctx, opt, arg, 1, NULL);
+ return ret;
}
static int parse_ffconfig(const char *filename)
}
const AVOption *av_set_string(void *obj, const char *name, const char *val){
- return av_set_string2(obj, name, val, 0);
+ const AVOption *o;
+ if (av_set_string3(obj, name, val, 0, &o) < 0)
+ return NULL;
+ return o;
}
const AVOption *av_set_double(void *obj, const char *name, double n){