Signed-off-by: Nicolas George <geo...@nsup.org>
---
libavfilter/avfilter.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index 92cba6f7a1..22a1fedd17 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -1177,10 +1177,10 @@ error:
return AVERROR_PATCHWELCOME;
}
-static int samples_ready(AVFilterLink *link)
+static int samples_ready(AVFilterLink *link, unsigned min)
{
return ff_framequeue_queued_frames(&link->fifo) &&
- (ff_framequeue_queued_samples(&link->fifo) >= link->min_samples ||
+ (ff_framequeue_queued_samples(&link->fifo) >= min ||
link->status_in);
}
@@ -1193,7 +1193,7 @@ static int take_samples(AVFilterLink *link, unsigned min,
unsigned max,
/* Note: this function relies on no format changes and must only be
called with enough samples. */
- av_assert1(samples_ready(link));
+ av_assert1(samples_ready(link, link->min_samples));
frame0 = frame = ff_framequeue_peek(&link->fifo, 0);
if (frame->nb_samples >= min && frame->nb_samples < max) {
*rframe = ff_framequeue_take(&link->fifo);
@@ -1320,7 +1320,7 @@ static int ff_filter_activate_default(AVFilterContext
*filter)
unsigned i;
for (i = 0; i < filter->nb_inputs; i++) {
- if (samples_ready(filter->inputs[i])) {
+ if (samples_ready(filter->inputs[i], filter->inputs[i]->min_samples)) {
return ff_filter_frame_to_filter(filter->inputs[i]);
}
}
--
2.11.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
