diff options
| author | Nicolas George <george@nsup.org> | 2017-08-31 17:40:26 +0200 |
|---|---|---|
| committer | Nicolas George <george@nsup.org> | 2017-09-12 11:03:50 +0200 |
| commit | 61b0b03f3fdc7553bd17325ad8932223a83ea816 (patch) | |
| tree | c3f0f696fe2f58e9043665d671d19dcf5ccf57f8 | |
| parent | 567d318b1cc11c7733dfe2f43a4bfe16c001865c (diff) | |
| download | ffmpeg-61b0b03f3fdc7553bd17325ad8932223a83ea816.tar.gz | |
lavfi/af_sidechaincompress: use helper macros.
| -rw-r--r-- | libavfilter/af_sidechaincompress.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/libavfilter/af_sidechaincompress.c b/libavfilter/af_sidechaincompress.c index f174b70a5b..55bed43844 100644 --- a/libavfilter/af_sidechaincompress.c +++ b/libavfilter/af_sidechaincompress.c @@ -188,10 +188,10 @@ static int activate(AVFilterContext *ctx) { SidechainCompressContext *s = ctx->priv; AVFrame *out = NULL, *in[2] = { NULL }; - int ret, i, status, nb_samples; + int ret, i, nb_samples; double *dst; - int64_t pts; + FF_FILTER_FORWARD_STATUS_BACK_ALL(ctx->outputs[0], ctx); if ((ret = ff_inlink_consume_frame(ctx->inputs[0], &in[0])) > 0) { av_audio_fifo_write(s->fifo[0], (void **)in[0]->extended_data, in[0]->nb_samples); @@ -239,13 +239,9 @@ static int activate(AVFilterContext *ctx) if (ret < 0) return ret; } - if (ff_inlink_acknowledge_status(ctx->inputs[0], &status, &pts)) { - ff_outlink_set_status(ctx->outputs[0], status, pts); - return 0; - } else if (ff_inlink_acknowledge_status(ctx->inputs[1], &status, &pts)) { - ff_outlink_set_status(ctx->outputs[0], status, pts); - return 0; - } else { + FF_FILTER_FORWARD_STATUS(ctx->inputs[0], ctx->outputs[0]); + FF_FILTER_FORWARD_STATUS(ctx->inputs[1], ctx->outputs[0]); + /* TODO reindent */ if (ff_outlink_frame_wanted(ctx->outputs[0])) { if (!av_audio_fifo_size(s->fifo[0])) ff_inlink_request_frame(ctx->inputs[0]); @@ -253,7 +249,6 @@ static int activate(AVFilterContext *ctx) ff_inlink_request_frame(ctx->inputs[1]); } return 0; - } } static int query_formats(AVFilterContext *ctx) |