diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-08 15:20:08 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-08 15:48:26 +0400 |
commit | e1f729d977be579ea75d1d3a3d5cffcf17865e86 (patch) | |
tree | 8e41fffaf4badf9477863a64e6bc4a3ff321246c /libavfilter/af_compand.c | |
parent | 14e2406de7d211d50fcce0059c90103bdaa947aa (diff) | |
parent | d3cfd7aff86ee3d449ca68aba21d67b9b2136a9b (diff) |
Merge commit 'd3cfd7aff86ee3d449ca68aba21d67b9b2136a9b'
* commit 'd3cfd7aff86ee3d449ca68aba21d67b9b2136a9b':
af_compand: make sure request_frame always outputs at least one frame
See: 6b68e2a43b3407522080be50a2a19cff2f9715ef
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/af_compand.c')
-rw-r--r-- | libavfilter/af_compand.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/libavfilter/af_compand.c b/libavfilter/af_compand.c index 89430acdec..4ca73c4522 100644 --- a/libavfilter/af_compand.c +++ b/libavfilter/af_compand.c @@ -278,7 +278,13 @@ static int compand_delay(AVFilterContext *ctx, AVFrame *frame) s->delay_index = dindex; av_frame_free(&frame); - return out_frame ? ff_filter_frame(ctx->outputs[0], out_frame) : 0; + + if (out_frame) { + err = ff_filter_frame(ctx->outputs[0], out_frame); + return err; + } + + return 0; } static int compand_drain(AVFilterLink *outlink) @@ -534,7 +540,7 @@ static int request_frame(AVFilterLink *outlink) { AVFilterContext *ctx = outlink->src; CompandContext *s = ctx->priv; - int ret; + int ret = 0; ret = ff_request_frame(ctx->inputs[0]); |