diff options
Diffstat (limited to 'libavfilter/af_amerge.c')
-rw-r--r-- | libavfilter/af_amerge.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavfilter/af_amerge.c b/libavfilter/af_amerge.c index 802188d028..660ae5dc9d 100644 --- a/libavfilter/af_amerge.c +++ b/libavfilter/af_amerge.c @@ -212,7 +212,7 @@ static inline void copy_samples(int nb_inputs, struct amerge_input in[], } } -static void filter_samples(AVFilterLink *inlink, AVFilterBufferRef *insamples) +static int filter_samples(AVFilterLink *inlink, AVFilterBufferRef *insamples) { AVFilterContext *ctx = inlink->dst; AMergeContext *am = ctx->priv; @@ -232,7 +232,7 @@ static void filter_samples(AVFilterLink *inlink, AVFilterBufferRef *insamples) for (i = 1; i < am->nb_inputs; i++) nb_samples = FFMIN(nb_samples, am->in[i].nb_samples); if (!nb_samples) - return; + return 0; outbuf = ff_get_audio_buffer(ctx->outputs[0], AV_PERM_WRITE, nb_samples); outs = outbuf->data[0]; @@ -285,7 +285,7 @@ static void filter_samples(AVFilterLink *inlink, AVFilterBufferRef *insamples) } } } - ff_filter_samples(ctx->outputs[0], outbuf); + return ff_filter_samples(ctx->outputs[0], outbuf); } static av_cold int init(AVFilterContext *ctx, const char *args) |