[FFmpeg-cvslog] avfilter/af_afade: make sure that in is available

[Paul B Mahol]

ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Wed Oct 16 00:45:26 2019 +0200| [29dac2927f5fa0b1f5c6b27a3ed32f2968ea9b00] | committer: Paul B Mahol

avfilter/af_afade: make sure that in is available

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=29dac2927f5fa0b1f5c6b27a3ed32f2968ea9b00
---

 libavfilter/af_afade.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/libavfilter/af_afade.c b/libavfilter/af_afade.c
index 0c43b2233d..10505caf1f 100644
--- a/libavfilter/af_afade.c
+++ b/libavfilter/af_afade.c
@@ -459,16 +459,17 @@ static int activate(AVFilterContext *ctx)
         } else if (ff_inlink_acknowledge_status(ctx->inputs[1], &status, &pts)) {
             ff_outlink_set_status(ctx->outputs[0], status, pts);
             return 0;
-        } else {
-            if (ff_outlink_frame_wanted(ctx->outputs[0]) && !in) {
+        } else if (!ret) {
+            if (ff_outlink_frame_wanted(ctx->outputs[0])) {
                 ff_inlink_request_frame(ctx->inputs[1]);
                 return 0;
             }
+        } else {
+            in->pts = s->pts;
+            s->pts += av_rescale_q(in->nb_samples,
+                      (AVRational){ 1, outlink->sample_rate }, outlink->time_base);
+            return ff_filter_frame(outlink, in);
         }
-        in->pts = s->pts;
-        s->pts += av_rescale_q(in->nb_samples,
-            (AVRational){ 1, outlink->sample_rate }, outlink->time_base);
-        return ff_filter_frame(outlink, in);
     }
 
     if (ff_inlink_queued_samples(ctx->inputs[0]) > s->nb_samples) {