diff options
| author | Matthieu Bouron <matthieu.bouron@smartjog.com> | 2012-04-26 17:43:00 +0200 |
|---|---|---|
| committer | Nicolas George <nicolas.george@normalesup.org> | 2012-04-26 18:56:35 +0200 |
| commit | 5473a98e45aff6635a6f742518a33ef6565ba2c3 (patch) | |
| tree | a8986fb3f9656652156b02132f0eed920b1cc179 /libavfilter | |
| parent | 27de7a8eb3b95665bb44fa26476ce0ce1bb88ea9 (diff) | |
af_amerge: return errors from subfilters when requesting a frame
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/af_amerge.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavfilter/af_amerge.c b/libavfilter/af_amerge.c index c9b0f21fd1..a160391a57 100644 --- a/libavfilter/af_amerge.c +++ b/libavfilter/af_amerge.c @@ -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; } |