diff --git a/ffprobe.c b/ffprobe.c
index e1ad6a7beba82f81ee6ea7d6c767e5d4037fd97e..6de9eb333127a44b03aeffa3104139697fec1f58 100644
--- a/ffprobe.c
+++ b/ffprobe.c
@@ -457,10 +457,8 @@ static av_cold int default_init(WriterContext *wctx, const char *args, void *opa
av_opt_set_defaults(def);
if (args &&
- (err = (av_set_options_string(def, args, "=", ":"))) < 0) {
- av_log(wctx, AV_LOG_ERROR, "Error parsing options string: '%s'\n", args);
+ (err = (av_set_options_string(def, args, "=", ":"))) < 0)
return err;
- }
return 0;
}
@@ -650,10 +648,8 @@ static av_cold int compact_init(WriterContext *wctx, const char *args, void *opa
av_opt_set_defaults(compact);
if (args &&
- (err = (av_set_options_string(compact, args, "=", ":"))) < 0) {
- av_log(wctx, AV_LOG_ERROR, "Error parsing options string: '%s'\n", args);
+ (err = (av_set_options_string(compact, args, "=", ":"))) < 0)
return err;
- }
if (strlen(compact->item_sep_str) != 1) {
av_log(wctx, AV_LOG_ERROR, "Item separator '%s' specified, but must contain a single character\n",
compact->item_sep_str);
@@ -808,10 +804,8 @@ static av_cold int flat_init(WriterContext *wctx, const char *args, void *opaque
av_opt_set_defaults(flat);
if (args &&
- (err = (av_set_options_string(flat, args, "=", ":"))) < 0) {
- av_log(wctx, AV_LOG_ERROR, "Error parsing options string: '%s'\n", args);
+ (err = (av_set_options_string(flat, args, "=", ":"))) < 0)
return err;
- }
if (strlen(flat->sep_str) != 1) {
av_log(wctx, AV_LOG_ERROR, "Item separator '%s' specified, but must contain a single character\n",
flat->sep_str);
@@ -966,10 +960,8 @@ static av_cold int ini_init(WriterContext *wctx, const char *args, void *opaque)
ini->class = &ini_class;
av_opt_set_defaults(ini);
- if (args && (err = av_set_options_string(ini, args, "=", ":")) < 0) {
- av_log(wctx, AV_LOG_ERROR, "Error parsing options string: '%s'\n", args);
+ if (args && (err = av_set_options_string(ini, args, "=", ":")) < 0)
return err;
- }
return 0;
}
@@ -1125,10 +1117,8 @@ static av_cold int json_init(WriterContext *wctx, const char *args, void *opaque
av_opt_set_defaults(json);
if (args &&
- (err = (av_set_options_string(json, args, "=", ":"))) < 0) {
- av_log(wctx, AV_LOG_ERROR, "Error parsing options string: '%s'\n", args);
+ (err = (av_set_options_string(json, args, "=", ":"))) < 0)
return err;
- }
json->item_sep = json->compact ? ", " : ",\n";
json->item_start_end = json->compact ? " " : "\n";
@@ -1350,10 +1340,8 @@ static av_cold int xml_init(WriterContext *wctx, const char *args, void *opaque)
av_opt_set_defaults(xml);
if (args &&
- (err = (av_set_options_string(xml, args, "=", ":"))) < 0) {
- av_log(wctx, AV_LOG_ERROR, "Error parsing options string: '%s'\n", args);
+ (err = (av_set_options_string(xml, args, "=", ":"))) < 0)
return err;
- }
if (xml->xsd_strict) {
xml->fully_qualified = 1;
diff --git a/libavfilter/af_aformat.c b/libavfilter/af_aformat.c
index 4e979422482f06ce93dc47a46fc0749dc9dfbf7c..6cf89ace2adae553c48b221cfc5a5524689d85ae 100644
--- a/libavfilter/af_aformat.c
+++ b/libavfilter/af_aformat.c
@@ -94,10 +94,8 @@ static av_cold int init(AVFilterContext *ctx, const char *args)
s->class = &aformat_class;
av_opt_set_defaults(s);
- if ((ret = av_set_options_string(s, args, "=", ":")) < 0) {
- av_log(ctx, AV_LOG_ERROR, "Error parsing options string '%s'.\n", args);
+ if ((ret = av_set_options_string(s, args, "=", ":")) < 0)
return ret;
- }
PARSE_FORMATS(s->formats_str, enum AVSampleFormat, s->formats,
ff_add_format, av_get_sample_fmt, AV_SAMPLE_FMT_NONE, "sample format");
diff --git a/libavfilter/af_amix.c b/libavfilter/af_amix.c
index 7f83750fa1a6fce73190bfef5d84f29033c658d6..dd5dfa91b323f24af92a187632718ebc8c527056 100644
--- a/libavfilter/af_amix.c
+++ b/libavfilter/af_amix.c
@@ -487,10 +487,8 @@ static int init(AVFilterContext *ctx, const char *args)
s->class = &amix_class;
av_opt_set_defaults(s);
- if ((ret = av_set_options_string(s, args, "=", ":")) < 0) {
- av_log(ctx, AV_LOG_ERROR, "Error parsing options string '%s'.\n", args);
+ if ((ret = av_set_options_string(s, args, "=", ":")) < 0)
return ret;
- }
av_opt_free(s);
for (i = 0; i < s->nb_inputs; i++) {
diff --git a/libavfilter/af_asetnsamples.c b/libavfilter/af_asetnsamples.c
index 8805d53a9714831d42c3a634698537c8c35a3144..23bda8ca01754c56bb543eb4186425a1bf33a52b 100644
--- a/libavfilter/af_asetnsamples.c
+++ b/libavfilter/af_asetnsamples.c
@@ -62,10 +62,8 @@ static av_cold int init(AVFilterContext *ctx, const char *args)
asns->class = &asetnsamples_class;
av_opt_set_defaults(asns);
- if ((err = av_set_options_string(asns, args, "=", ":")) < 0) {
- av_log(ctx, AV_LOG_ERROR, "Error parsing options string: '%s'\n", args);
+ if ((err = av_set_options_string(asns, args, "=", ":")) < 0)
return err;
- }
asns->next_out_pts = AV_NOPTS_VALUE;
av_log(ctx, AV_LOG_VERBOSE, "nb_out_samples:%d pad:%d\n", asns->nb_out_samples, asns->pad);
diff --git a/libavfilter/af_asyncts.c b/libavfilter/af_asyncts.c
index 1737d6138d8d6b921ee3e2a2bd28cf8ea249f6da..0fe4570896142f328eed51bc018841d4ec120ad6 100644
--- a/libavfilter/af_asyncts.c
+++ b/libavfilter/af_asyncts.c
@@ -63,10 +63,8 @@ static int init(AVFilterContext *ctx, const char *args)
s->class = &asyncts_class;
av_opt_set_defaults(s);
- if ((ret = av_set_options_string(s, args, "=", ":")) < 0) {
- av_log(ctx, AV_LOG_ERROR, "Error parsing options string '%s'.\n", args);
+ if ((ret = av_set_options_string(s, args, "=", ":")) < 0)
return ret;
- }
av_opt_free(s);
return 0;
diff --git a/libavfilter/af_channelmap.c b/libavfilter/af_channelmap.c
index 9e2509c30e4aaaf833c4449fc2bcadbf74cf57b9..170fad68f6b5adefe1b4242001009c1bc073bb57 100644
--- a/libavfilter/af_channelmap.c
+++ b/libavfilter/af_channelmap.c
@@ -138,10 +138,8 @@ static av_cold int channelmap_init(AVFilterContext *ctx, const char *args)
s->class = &channelmap_class;
av_opt_set_defaults(s);
- if ((ret = av_set_options_string(s, args, "=", ":")) < 0) {
- av_log(ctx, AV_LOG_ERROR, "Error parsing options string '%s'.\n", args);
+ if ((ret = av_set_options_string(s, args, "=", ":")) < 0)
return ret;
- }
mapping = s->mapping_str;
diff --git a/libavfilter/af_channelsplit.c b/libavfilter/af_channelsplit.c
index 3db08045c22642381c01bd04781c0e5fb6459639..d15c781bf5c53da25291cb457db7aa64013735e6 100644
--- a/libavfilter/af_channelsplit.c
+++ b/libavfilter/af_channelsplit.c
@@ -55,10 +55,8 @@ static int init(AVFilterContext *ctx, const char *arg)
s->class = &channelsplit_class;
av_opt_set_defaults(s);
- if ((ret = av_set_options_string(s, arg, "=", ":")) < 0) {
- av_log(ctx, AV_LOG_ERROR, "Error parsing options string '%s'.\n", arg);
+ if ((ret = av_set_options_string(s, arg, "=", ":")) < 0)
return ret;
- }
if (!(s->channel_layout = av_get_channel_layout(s->channel_layout_str))) {
av_log(ctx, AV_LOG_ERROR, "Error parsing channel layout '%s'.\n",
s->channel_layout_str);
diff --git a/libavfilter/af_join.c b/libavfilter/af_join.c
index f25ec921dc8f48f60457493d0159e54a0c62c904..37bad9c7ea1e14d1ec8ab7533f3bf4533a8a3ffc 100644
--- a/libavfilter/af_join.c
+++ b/libavfilter/af_join.c
@@ -193,10 +193,8 @@ static int join_init(AVFilterContext *ctx, const char *args)
s->class = &join_class;
av_opt_set_defaults(s);
- if ((ret = av_set_options_string(s, args, "=", ":")) < 0) {
- av_log(ctx, AV_LOG_ERROR, "Error parsing options string '%s'.\n", args);
+ if ((ret = av_set_options_string(s, args, "=", ":")) < 0)
return ret;
- }
if (!(s->channel_layout = av_get_channel_layout(s->channel_layout_str))) {
av_log(ctx, AV_LOG_ERROR, "Error parsing channel layout '%s'.\n",
diff --git a/libavfilter/af_silencedetect.c b/libavfilter/af_silencedetect.c
index d3b125fc5b5a4da9fadc3fd031491ac7acf0fd71..bfda3e574da89fae4855157d4f1e9e223ef05527 100644
--- a/libavfilter/af_silencedetect.c
+++ b/libavfilter/af_silencedetect.c
@@ -61,10 +61,8 @@ static av_cold int init(AVFilterContext *ctx, const char *args)
silence->class = &silencedetect_class;
av_opt_set_defaults(silence);
- if ((ret = av_set_options_string(silence, args, "=", ":")) < 0) {
- av_log(ctx, AV_LOG_ERROR, "Error parsing options string: '%s'\n", args);
+ if ((ret = av_set_options_string(silence, args, "=", ":")) < 0)
return ret;
- }
silence->noise = strtod(silence->noise_str, &tail);
if (!strcmp(tail, "dB")) {
diff --git a/libavfilter/asrc_anullsrc.c b/libavfilter/asrc_anullsrc.c
index 3df542942b0edaf3b1dfd380013d61ea4e668981..008cb2a01bbaba763d52912532f4b4be922dc70e 100644
--- a/libavfilter/asrc_anullsrc.c
+++ b/libavfilter/asrc_anullsrc.c
@@ -64,10 +64,8 @@ static int init(AVFilterContext *ctx, const char *args)
null->class = &anullsrc_class;
av_opt_set_defaults(null);
- if ((ret = (av_set_options_string(null, args, "=", ":"))) < 0) {
- av_log(ctx, AV_LOG_ERROR, "Error parsing options string: '%s'\n", args);
+ if ((ret = (av_set_options_string(null, args, "=", ":"))) < 0)
return ret;
- }
if ((ret = ff_parse_sample_rate(&null->sample_rate,
null->sample_rate_str, ctx)) < 0)
diff --git a/libavfilter/asrc_flite.c b/libavfilter/asrc_flite.c
index 71271be5e404dd6170f32ead4a07991cb5bd5bb4..49f15da1609a0e6e38d93d6256bb7040d54d3a5c 100644
--- a/libavfilter/asrc_flite.c
+++ b/libavfilter/asrc_flite.c
@@ -138,10 +138,8 @@ static av_cold int init(AVFilterContext *ctx, const char *args)
flite->class = &flite_class;
av_opt_set_defaults(flite);
- if ((ret = av_set_options_string(flite, args, "=", ":")) < 0) {
- av_log(ctx, AV_LOG_ERROR, "Error parsing options string: '%s'\n", args);
+ if ((ret = av_set_options_string(flite, args, "=", ":")) < 0)
return ret;
- }
if (flite->list_voices) {
list_voices(ctx, "\n");
diff --git a/libavfilter/avf_showwaves.c b/libavfilter/avf_showwaves.c
index 96ed2c7ebcd58286ab7b16a83afa95dbc7971c2c..e040d8ed2c03e6662766411f356ef45d6992c1b3 100644
--- a/libavfilter/avf_showwaves.c
+++ b/libavfilter/avf_showwaves.c
@@ -66,10 +66,8 @@ static av_cold int init(AVFilterContext *ctx, const char *args)
av_opt_set_defaults(showwaves);
showwaves->buf_idx = 0;
- if ((err = av_set_options_string(showwaves, args, "=", ":")) < 0) {
- av_log(ctx, AV_LOG_ERROR, "Error parsing options string: '%s'\n", args);
+ if ((err = av_set_options_string(showwaves, args, "=", ":")) < 0)
return err;
- }
return 0;
}
diff --git a/libavfilter/buffersrc.c b/libavfilter/buffersrc.c
index 153ab6c0f71f11ad174a0669d4ac2ec0d6c7b7fa..6803b69500194cd541316042dbe2d937fc898811 100644
--- a/libavfilter/buffersrc.c
+++ b/libavfilter/buffersrc.c
@@ -194,10 +194,8 @@ static av_cold int init_video(AVFilterContext *ctx, const char *args)
if (equal && (!colon || equal < colon)) {
av_opt_set_defaults(c);
ret = av_set_options_string(c, args, "=", ":");
- if (ret < 0) {
- av_log(ctx, AV_LOG_ERROR, "Error parsing options string: %s\n", args);
+ if (ret < 0)
goto fail;
- }
} else {
if ((n = sscanf(args, "%d:%d:%127[^:]:%d:%d:%d:%d:%255c", &c->w, &c->h, pix_fmt_str,
&c->time_base.num, &c->time_base.den,
@@ -253,10 +251,8 @@ static av_cold int init_audio(AVFilterContext *ctx, const char *args)
s->class = &abuffer_class;
av_opt_set_defaults(s);
- if ((ret = av_set_options_string(s, args, "=", ":")) < 0) {
- av_log(ctx, AV_LOG_ERROR, "Error parsing options string: '%s'\n", args);
+ if ((ret = av_set_options_string(s, args, "=", ":")) < 0)
goto fail;
- }
s->sample_fmt = av_get_sample_fmt(s->sample_fmt_str);
if (s->sample_fmt == AV_SAMPLE_FMT_NONE) {
diff --git a/libavfilter/src_movie.c b/libavfilter/src_movie.c
index 56e70838693c3eadac0b468ef97777b5808a49ba..09dfe5d214675d29474dd672f009329697be459f 100644
--- a/libavfilter/src_movie.c
+++ b/libavfilter/src_movie.c
@@ -205,10 +205,8 @@ static av_cold int movie_init(AVFilterContext *ctx, const char *args)
return AVERROR(EINVAL);
}
- if (*args++ == ':' && (ret = av_set_options_string(movie, args, "=", ":")) < 0) {
- av_log(ctx, AV_LOG_ERROR, "Error parsing options string: '%s'\n", args);
+ if (*args++ == ':' && (ret = av_set_options_string(movie, args, "=", ":")) < 0)
return ret;
- }
movie->seek_point = movie->seek_point_d * 1000000 + 0.5;
diff --git a/libavfilter/vf_ass.c b/libavfilter/vf_ass.c
index a40f93cc674bc878d404a960c9ecb8cbbe5d9700..01adf5be5a328ce070e6cd939b2ae2f5d66d6c7e 100644
--- a/libavfilter/vf_ass.c
+++ b/libavfilter/vf_ass.c
@@ -94,10 +94,8 @@ static av_cold int init(AVFilterContext *ctx, const char *args)
return AVERROR(EINVAL);
}
- if (*args++ == ':' && (ret = av_set_options_string(ass, args, "=", ":")) < 0) {
- av_log(ctx, AV_LOG_ERROR, "Error parsing options string: '%s'\n", args);
+ if (*args++ == ':' && (ret = av_set_options_string(ass, args, "=", ":")) < 0)
return ret;
- }
ass->library = ass_library_init();
if (!ass->library) {
diff --git a/libavfilter/vf_blackdetect.c b/libavfilter/vf_blackdetect.c
index 96165d2fcda2a1b172adfdb849f354374e8fbd4d..29f6c079d50b86d614c7a152f785738fe8b697e5 100644
--- a/libavfilter/vf_blackdetect.c
+++ b/libavfilter/vf_blackdetect.c
@@ -88,10 +88,8 @@ static av_cold int init(AVFilterContext *ctx, const char *args)
blackdetect->class = &blackdetect_class;
av_opt_set_defaults(blackdetect);
- if ((ret = av_set_options_string(blackdetect, args, "=", ":")) < 0) {
- av_log(ctx, AV_LOG_ERROR, "Error parsing options string: '%s'\n", args);
+ if ((ret = av_set_options_string(blackdetect, args, "=", ":")) < 0)
return ret;
- }
return 0;
}
diff --git a/libavfilter/vf_delogo.c b/libavfilter/vf_delogo.c
index c52036228c07f26dc17257f285ad40bf1726a592..a80b1fe571b9c4484123a44f7e1641f67e2cb612 100644
--- a/libavfilter/vf_delogo.c
+++ b/libavfilter/vf_delogo.c
@@ -180,10 +180,8 @@ static av_cold int init(AVFilterContext *ctx, const char *args)
if (ret == 5) {
if (delogo->band < 0)
delogo->show = 1;
- } else if ((ret = (av_set_options_string(delogo, args, "=", ":"))) < 0) {
- av_log(ctx, AV_LOG_ERROR, "Error parsing options string: '%s'\n", args);
+ } else if ((ret = (av_set_options_string(delogo, args, "=", ":"))) < 0)
return ret;
- }
#define CHECK_UNSET_OPT(opt) \
if (delogo->opt == -1) { \
diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c
index ac619428efa318b9c2dd76fde4ea360efc956da0..0f7564d383c97a29781eb00e108d5b8e5625fb3e 100644
--- a/libavfilter/vf_drawtext.c
+++ b/libavfilter/vf_drawtext.c
@@ -388,10 +388,8 @@ static av_cold int init(AVFilterContext *ctx, const char *args)
dtext->class = &drawtext_class;
av_opt_set_defaults(dtext);
- if ((err = av_set_options_string(dtext, args, "=", ":")) < 0) {
- av_log(ctx, AV_LOG_ERROR, "Error parsing options string: '%s'\n", args);
+ if ((err = av_set_options_string(dtext, args, "=", ":")) < 0)
return err;
- }
if (!dtext->fontfile && !CONFIG_FONTCONFIG) {
av_log(ctx, AV_LOG_ERROR, "No font filename provided\n");
diff --git a/libavfilter/vsrc_cellauto.c b/libavfilter/vsrc_cellauto.c
index b2c9d5867b1e89f8b54615a6a15c5da4b8b66db7..971e1df64bcf03a5ad308c1db918bb5fa0bb4b5d 100644
--- a/libavfilter/vsrc_cellauto.c
+++ b/libavfilter/vsrc_cellauto.c
@@ -167,10 +167,8 @@ static int init(AVFilterContext *ctx, const char *args)
cellauto->class = &cellauto_class;
av_opt_set_defaults(cellauto);
- if ((ret = av_set_options_string(cellauto, args, "=", ":")) < 0) {
- av_log(ctx, AV_LOG_ERROR, "Error parsing options string: '%s'\n", args);
+ if ((ret = av_set_options_string(cellauto, args, "=", ":")) < 0)
return ret;
- }
if ((ret = av_parse_video_rate(&frame_rate, cellauto->rate)) < 0) {
av_log(ctx, AV_LOG_ERROR, "Invalid frame rate: %s\n", cellauto->rate);
diff --git a/libavfilter/vsrc_life.c b/libavfilter/vsrc_life.c
index c71291f2717b6d7089d7324b2a8b6d5dc32a2719..b2b7c4a87dcca63e43bfb3d582dabdaa6e8dd107 100644
--- a/libavfilter/vsrc_life.c
+++ b/libavfilter/vsrc_life.c
@@ -228,10 +228,8 @@ static int init(AVFilterContext *ctx, const char *args)
life->class = &life_class;
av_opt_set_defaults(life);
- if ((ret = av_set_options_string(life, args, "=", ":")) < 0) {
- av_log(ctx, AV_LOG_ERROR, "Error parsing options string: '%s'\n", args);
+ if ((ret = av_set_options_string(life, args, "=", ":")) < 0)
return ret;
- }
if ((ret = av_parse_video_rate(&frame_rate, life->rate)) < 0) {
av_log(ctx, AV_LOG_ERROR, "Invalid frame rate: %s\n", life->rate);
diff --git a/libavfilter/vsrc_mandelbrot.c b/libavfilter/vsrc_mandelbrot.c
index 2a8efa023d288aca9b1858c776ddfbf97417da12..46e037ef1842575654638e7c6d787161419854d4 100644
--- a/libavfilter/vsrc_mandelbrot.c
+++ b/libavfilter/vsrc_mandelbrot.c
@@ -117,10 +117,8 @@ static av_cold int init(AVFilterContext *ctx, const char *args)
mb->class = &mandelbrot_class;
av_opt_set_defaults(mb);
- if ((err = (av_set_options_string(mb, args, "=", ":"))) < 0) {
- av_log(ctx, AV_LOG_ERROR, "Error parsing options string: '%s'\n", args);
+ if ((err = (av_set_options_string(mb, args, "=", ":"))) < 0)
return err;
- }
mb->bailout *= mb->bailout;
mb->start_scale /=mb->h;
diff --git a/libavfilter/vsrc_mptestsrc.c b/libavfilter/vsrc_mptestsrc.c
index 6a4df1efa4dfceec7da735e37f3f8bd13b2ef89d..4e312c5b8ddfef4971ab9b3307334703ae34ccbd 100644
--- a/libavfilter/vsrc_mptestsrc.c
+++ b/libavfilter/vsrc_mptestsrc.c
@@ -266,10 +266,8 @@ static av_cold int init(AVFilterContext *ctx, const char *args)
test->class = &mptestsrc_class;
av_opt_set_defaults(test);
- if ((ret = (av_set_options_string(test, args, "=", ":"))) < 0) {
- av_log(ctx, AV_LOG_ERROR, "Error parsing options string: '%s'\n", args);
+ if ((ret = (av_set_options_string(test, args, "=", ":"))) < 0)
return ret;
- }
if ((ret = av_parse_video_rate(&frame_rate_q, test->rate)) < 0) {
av_log(ctx, AV_LOG_ERROR, "Invalid frame rate: '%s'\n", test->rate);
diff --git a/libavfilter/vsrc_testsrc.c b/libavfilter/vsrc_testsrc.c
index a7e41e0892f2bc4b9f2f4e713a838adb09ac0aa4..9640faeb8829a840a28d4a2b6316e7dd24be3bb5 100644
--- a/libavfilter/vsrc_testsrc.c
+++ b/libavfilter/vsrc_testsrc.c
@@ -100,10 +100,8 @@ static av_cold int init(AVFilterContext *ctx, const char *args)
av_opt_set_defaults(test);
- if ((ret = (av_set_options_string(test, args, "=", ":"))) < 0) {
- av_log(ctx, AV_LOG_ERROR, "Error parsing options string: '%s'\n", args);
+ if ((ret = (av_set_options_string(test, args, "=", ":"))) < 0)
return ret;
- }
if ((ret = av_parse_video_rate(&frame_rate_q, test->rate)) < 0) {
av_log(ctx, AV_LOG_ERROR, "Invalid frame rate: '%s'\n", test->rate);