Commit e1f729d9 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'd3cfd7af'

* commit 'd3cfd7af':
  af_compand: make sure request_frame always outputs at least one frame

See: 6b68e2a4Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 14e2406d d3cfd7af
......@@ -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]);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment