[FFmpeg-cvslog] lavfi/af_amerge: return EAGAIN if the input layouts are not known.

[Nicolas George]

ffmpeg | branch: master | Nicolas George <nicolas.george at normalesup.org> | Thu Feb 21 20:15:32 2013 +0100| [00da527b44a6b7195bf2b287c3214f349cd8dd0b] | committer: Nicolas George

lavfi/af_amerge: return EAGAIN if the input layouts are not known.

Also downgrade the error to a warning.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=00da527b44a6b7195bf2b287c3214f349cd8dd0b
---

 libavfilter/af_amerge.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavfilter/af_amerge.c b/libavfilter/af_amerge.c
index 28c3682..6e83aeb 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) {