generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove calls to deprecated av_set_string2() with calls to

Browse Source 
av_set_string3().

Originally committed as revision 16241 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Stefano Sabatini 2008-12-19 22:29:30 +00:00
parent aac8b76983
commit f16dd7e65a
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmdutils.c
View File

@ -224,7 +224,7 @@ void set_context_opts(void *ctx, void *opts_ctx, int flags)
const char *str= av_get_string(opts_ctx, opt_names[i], &opt, buf, sizeof(buf)); 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 an option with name opt_names[i] is present in opts_ctx then str is non-NULL */
if(str && ((opt->flags & flags) == flags)) 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);
} }
} }

8
ffserver.c
View File

@ -3735,13 +3735,11 @@ static void load_module(const char *filename)
static int ffserver_opt_default(const char *opt, const char *arg, static int ffserver_opt_default(const char *opt, const char *arg,
AVCodecContext *avctx, int type) AVCodecContext *avctx, int type)
{ {
const AVOption *o = NULL; int ret = 0;
const AVOption *o2 = av_find_opt(avctx, opt, NULL, type, type); const AVOption *o2 = av_find_opt(avctx, opt, NULL, type, type);
if(o2) if(o2)
o = av_set_string2(avctx, opt, arg, 1); ret = av_set_string3(avctx, opt, arg, 1, NULL);
if(!o) return ret;
return -1;
return 0;
} }
static int parse_ffconfig(const char *filename) static int parse_ffconfig(const char *filename)

5
libavcodec/opt.c
View File

@ -207,7 +207,10 @@ const AVOption *av_set_string2(void *obj, const char *name, const char *val, int
} }
const AVOption *av_set_string(void *obj, const char *name, const char *val){ 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){ const AVOption *av_set_double(void *obj, const char *name, double n){