]> git.sesse.net Git - ffmpeg/commitdiff
lavfi/af_amerge: return EAGAIN if the input layouts are not known.
authorNicolas George <nicolas.george@normalesup.org>
Thu, 21 Feb 2013 19:15:32 +0000 (20:15 +0100)
committerNicolas George <nicolas.george@normalesup.org>
Sun, 24 Mar 2013 22:17:47 +0000 (23:17 +0100)
Also downgrade the error to a warning.

libavfilter/af_amerge.c

index 28c368215faef28ba3cab8bc1ef9c8164b963140..6e83aeb0760bf56cdea84f9e0c2410ca974799f1 100644 (file)
@@ -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) {