diff options
author | Clément Bœsch <ubitux@gmail.com> | 2012-08-09 00:49:27 +0200 |
---|---|---|
committer | Clément Bœsch <ubitux@gmail.com> | 2012-08-09 08:11:00 +0200 |
commit | cc650cf029d8a2aa3c245b014363db673fd2d722 (patch) | |
tree | 19cd52f75fb09d8c11b52e5b83bf66f73acdbfd0 /ffprobe.c | |
parent | 5d8e54fe1ded58cd2d76c112041f5202ce762aef (diff) | |
download | ffmpeg-streaming-cc650cf029d8a2aa3c245b014363db673fd2d722.zip ffmpeg-streaming-cc650cf029d8a2aa3c245b014363db673fd2d722.tar.gz |
Remove "Error parsing options string [...]" messages.
This reduces from 3 to 2 messages for the same syntax error in ffprobe,
and from 4 to 3 in filters.
Diffstat (limited to 'ffprobe.c')
-rw-r--r-- | ffprobe.c | 24 |
1 files changed, 6 insertions, 18 deletions
@@ -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; |