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 /libavfilter/buffersrc.c | |
| parent | 5d8e54fe1ded58cd2d76c112041f5202ce762aef (diff) | |
| download | ffmpeg-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 'libavfilter/buffersrc.c')
| -rw-r--r-- | libavfilter/buffersrc.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/libavfilter/buffersrc.c b/libavfilter/buffersrc.c index 153ab6c0f7..6803b69500 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) { |