diff options
| author | Nicolas George <nicolas.george@normalesup.org> | 2013-02-21 20:15:32 +0100 |
|---|---|---|
| committer | Nicolas George <nicolas.george@normalesup.org> | 2013-03-24 23:17:47 +0100 |
| commit | 00da527b44a6b7195bf2b287c3214f349cd8dd0b (patch) | |
| tree | 0bed93819d3806998730008842ac6bd3e48fcb3f /libavfilter/af_amerge.c | |
| parent | 57cb4fb0750a92fba83b33eb08de6001eec4f197 (diff) | |
lavfi/af_amerge: return EAGAIN if the input layouts are not known.
Also downgrade the error to a warning.
Diffstat (limited to 'libavfilter/af_amerge.c')
| -rw-r--r-- | libavfilter/af_amerge.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavfilter/af_amerge.c b/libavfilter/af_amerge.c index 28c368215f..6e83aeb076 100644 --- a/libavfilter/af_amerge.c +++ b/libavfilter/af_amerge.c @@ -82,9 +82,9 @@ static int query_formats(AVFilterContext *ctx) for (i = 0; i < am->nb_inputs; i++) { if (!ctx->inputs[i]->in_channel_layouts || !ctx->inputs[i]->in_channel_layouts->nb_channel_layouts) { - av_log(ctx, AV_LOG_ERROR, + av_log(ctx, AV_LOG_WARNING, "No channel layout for input %d\n", i + 1); - return AVERROR(EINVAL); + return AVERROR(EAGAIN); } inlayout[i] = ctx->inputs[i]->in_channel_layouts->channel_layouts[0]; if (ctx->inputs[i]->in_channel_layouts->nb_channel_layouts > 1) { |