summaryrefslogtreecommitdiffstats
path: root/libavfilter
diff options
context:
space:
mode:
authorPaul B Mahol <onemda@gmail.com>2019-10-31 10:22:05 +0100
committerPaul B Mahol <onemda@gmail.com>2019-10-31 10:23:59 +0100
commit86a42e954e8e75175a65ef93d05fece8e001e36b (patch)
tree42c66f0c3435a5f1373e89ac2e2aa7ae81a0308c /libavfilter
parent7c872df3e175d1c9de4aeb294abcd7c6ab4bb0f3 (diff)
downloadffmpeg-streaming-86a42e954e8e75175a65ef93d05fece8e001e36b.zip
ffmpeg-streaming-86a42e954e8e75175a65ef93d05fece8e001e36b.tar.gz
avfilter/af_afade: start crossfading only when first stream reached end
Diffstat (limited to 'libavfilter')
-rw-r--r--libavfilter/af_afade.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavfilter/af_afade.c b/libavfilter/af_afade.c
index 23608fb..4edfd27 100644
--- a/libavfilter/af_afade.c
+++ b/libavfilter/af_afade.c
@@ -485,7 +485,7 @@ static int activate(AVFilterContext *ctx)
(AVRational){ 1, outlink->sample_rate }, outlink->time_base);
return ff_filter_frame(outlink, in);
} else if (ff_inlink_queued_samples(ctx->inputs[0]) >= s->nb_samples &&
- ff_inlink_queued_samples(ctx->inputs[1]) >= s->nb_samples) {
+ ff_inlink_queued_samples(ctx->inputs[1]) >= s->nb_samples && s->cf0_eof) {
if (s->overlap) {
out = ff_get_audio_buffer(outlink, s->nb_samples);
if (!out)
OpenPOWER on IntegriCloud