virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

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

Browse Source 
Also downgrade the error to a warning.
This commit is contained in:
Nicolas George
2013-02-21 20:15:32 +01:00
parent 57cb4fb075
commit 00da527b44
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavfilter/af_amerge.c
View File

@@ -82,9 +82,9 @@ static int query_formats(AVFilterContext *ctx)
for (i = 0; i < am->nb_inputs; i++) { for (i = 0; i < am->nb_inputs; i++) {
if (!ctx->inputs[i]->in_channel_layouts || if (!ctx->inputs[i]->in_channel_layouts ||
!ctx->inputs[i]->in_channel_layouts->nb_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); "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]; inlayout[i] = ctx->inputs[i]->in_channel_layouts->channel_layouts[0];
if (ctx->inputs[i]->in_channel_layouts->nb_channel_layouts > 1) { if (ctx->inputs[i]->in_channel_layouts->nb_channel_layouts > 1) {