virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-10-30 23:18:11 +02:00
Code Issues Releases Activity

af_amerge: return errors from subfilters when requesting a frame

Browse Source
This commit is contained in:
Matthieu Bouron
2012-04-26 17:43:00 +02:00
committed by Nicolas George
parent 27de7a8eb3
commit 5473a98e45
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libavfilter/af_amerge.c
View File

@@ -141,11 +141,12 @@ static int request_frame(AVFilterLink *outlink)
{
AVFilterContext *ctx = outlink->src;
AMergeContext *am = ctx->priv;
int i;
int i, ret;
for (i = 0; i < 2; i++)
if (!am->queue[i].nb_samples)
avfilter_request_frame(ctx->inputs[i]);
if ((ret = avfilter_request_frame(ctx->inputs[i])) < 0)
return ret;
return 0;
}