diff options
| author | Paul B Mahol <onemda@gmail.com> | 2018-11-03 18:08:50 +0100 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2018-11-03 18:24:35 +0100 |
| commit | 4b82b71041201e1c0a1b4080984174f8140589bf (patch) | |
| tree | 573c86693a2bb2451d3c45cc9afb7755574f5dc8 | |
| parent | decc008929e3bf2b6260a150ed806107efa39a9b (diff) | |
| download | ffmpeg-4b82b71041201e1c0a1b4080984174f8140589bf.tar.gz | |
avfilter/af_amerge: use ff_inlink_queued_samples()
| -rw-r--r-- | libavfilter/af_amerge.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/libavfilter/af_amerge.c b/libavfilter/af_amerge.c index 3961c90701..567f25982d 100644 --- a/libavfilter/af_amerge.c +++ b/libavfilter/af_amerge.c @@ -23,9 +23,6 @@ * Audio merging filter */ -#define FF_INTERNAL_FIELDS 1 -#include "framequeue.h" - #include "libavutil/avstring.h" #include "libavutil/bprint.h" #include "libavutil/channel_layout.h" @@ -285,9 +282,9 @@ static int activate(AVFilterContext *ctx) FF_FILTER_FORWARD_STATUS_BACK_ALL(ctx->outputs[0], ctx); - nb_samples = ff_framequeue_queued_samples(&ctx->inputs[0]->fifo); + nb_samples = ff_inlink_queued_samples(ctx->inputs[0]); for (i = 1; i < ctx->nb_inputs && nb_samples > 0; i++) { - nb_samples = FFMIN(ff_framequeue_queued_samples(&ctx->inputs[i]->fifo), nb_samples); + nb_samples = FFMIN(ff_inlink_queued_samples(ctx->inputs[i]), nb_samples); } if (nb_samples) { @@ -297,7 +294,7 @@ static int activate(AVFilterContext *ctx) } for (i = 0; i < ctx->nb_inputs; i++) { - if (ff_framequeue_queued_samples(&ctx->inputs[i]->fifo)) + if (ff_inlink_queued_samples(ctx->inputs[i])) continue; if (ff_inlink_acknowledge_status(ctx->inputs[i], &status, &pts)) { |