Commit 1dce2368 authored by Stefano Sabatini's avatar Stefano Sabatini

lavfi/buffer: apply misc consistency nits

parent 201b409d
...@@ -250,7 +250,7 @@ static av_cold int init_video(AVFilterContext *ctx, const char *args, void *opaq ...@@ -250,7 +250,7 @@ static av_cold int init_video(AVFilterContext *ctx, const char *args, void *opaq
av_opt_set_defaults(c); av_opt_set_defaults(c);
ret = av_set_options_string(c, args, "=", ":"); ret = av_set_options_string(c, args, "=", ":");
if (ret < 0) { if (ret < 0) {
av_log(ctx, AV_LOG_ERROR, "Error parsing options string: %s.\n", args); av_log(ctx, AV_LOG_ERROR, "Error parsing options string: %s\n", args);
goto fail; goto fail;
} }
} else { } else {
...@@ -261,7 +261,7 @@ static av_cold int init_video(AVFilterContext *ctx, const char *args, void *opaq ...@@ -261,7 +261,7 @@ static av_cold int init_video(AVFilterContext *ctx, const char *args, void *opaq
ret = AVERROR(EINVAL); ret = AVERROR(EINVAL);
goto fail; goto fail;
} }
av_log(ctx, AV_LOG_WARNING, "Flat options syntax is deprecated, use key=value pairs.\n"); av_log(ctx, AV_LOG_WARNING, "Flat options syntax is deprecated, use key=value pairs\n");
if ((ret = ff_parse_pixel_format(&c->pix_fmt, pix_fmt_str, ctx)) < 0) if ((ret = ff_parse_pixel_format(&c->pix_fmt, pix_fmt_str, ctx)) < 0)
goto fail; goto fail;
...@@ -308,13 +308,13 @@ static av_cold int init_audio(AVFilterContext *ctx, const char *args, void *opaq ...@@ -308,13 +308,13 @@ static av_cold int init_audio(AVFilterContext *ctx, const char *args, void *opaq
av_opt_set_defaults(s); av_opt_set_defaults(s);
if ((ret = av_set_options_string(s, args, "=", ":")) < 0) { if ((ret = av_set_options_string(s, args, "=", ":")) < 0) {
av_log(ctx, AV_LOG_ERROR, "Error parsing options string: %s.\n", args); av_log(ctx, AV_LOG_ERROR, "Error parsing options string: '%s'\n", args);
goto fail; goto fail;
} }
s->sample_fmt = av_get_sample_fmt(s->sample_fmt_str); s->sample_fmt = av_get_sample_fmt(s->sample_fmt_str);
if (s->sample_fmt == AV_SAMPLE_FMT_NONE) { if (s->sample_fmt == AV_SAMPLE_FMT_NONE) {
av_log(ctx, AV_LOG_ERROR, "Invalid sample format %s.\n", av_log(ctx, AV_LOG_ERROR, "Invalid sample format '%s'\n",
s->sample_fmt_str); s->sample_fmt_str);
ret = AVERROR(EINVAL); ret = AVERROR(EINVAL);
goto fail; goto fail;
...@@ -322,7 +322,7 @@ static av_cold int init_audio(AVFilterContext *ctx, const char *args, void *opaq ...@@ -322,7 +322,7 @@ static av_cold int init_audio(AVFilterContext *ctx, const char *args, void *opaq
s->channel_layout = av_get_channel_layout(s->channel_layout_str); s->channel_layout = av_get_channel_layout(s->channel_layout_str);
if (!s->channel_layout) { if (!s->channel_layout) {
av_log(ctx, AV_LOG_ERROR, "Invalid channel layout %s.\n", av_log(ctx, AV_LOG_ERROR, "Invalid channel layout '%s'\n",
s->channel_layout_str); s->channel_layout_str);
ret = AVERROR(EINVAL); ret = AVERROR(EINVAL);
goto fail; goto fail;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment