Make sure that an output frame has really been produced before returning
0.
---
libavfilter/af_resample.c | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/libavfilter/af_resample.c b/libavfilter/af_resample.c
index 8a02cfe..6a3a224 100644
--- a/libavfilter/af_resample.c
+++ b/libavfilter/af_resample.c
@@ -38,6 +38,9 @@ typedef struct ResampleContext {
AVAudioResampleContext *avr;
int64_t next_pts;
+
+ /* set by filter_samples() to signal an output frame to request_frame() */
+ int got_output;
} ResampleContext;
static av_cold void uninit(AVFilterContext *ctx)
@@ -130,7 +133,11 @@ static int request_frame(AVFilterLink *outlink)
{
AVFilterContext *ctx = outlink->src;
ResampleContext *s = ctx->priv;
- int ret = ff_request_frame(ctx->inputs[0]);
+ int ret = 0;
+
+ s->got_output = 0;
+ while (ret >= 0 && !s->got_output)
+ ret = ff_request_frame(ctx->inputs[0]);
/* flush the lavr delay buffer */
if (ret == AVERROR_EOF && s->avr) {
@@ -209,10 +216,13 @@ static void filter_samples(AVFilterLink *inlink,
AVFilterBufferRef *buf)
s->next_pts = buf_out->pts + buf_out->audio->nb_samples;
ff_filter_samples(outlink, buf_out);
+ s->got_output = 1;
}
avfilter_unref_buffer(buf);
- } else
+ } else {
ff_filter_samples(outlink, buf);
+ s->got_output = 1;
+ }
}
AVFilter avfilter_af_resample = {
--
1.7.10
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
