summaryrefslogtreecommitdiff
path: root/libavfilter
diff options
context:
space:
mode:
authorNicolas George <george@nsup.org>2016-12-22 14:21:24 +0100
committerNicolas George <george@nsup.org>2017-01-12 14:06:16 +0100
commit2e5af443c376bd2019a633e5c61b97f116b01ad2 (patch)
tree24541eed26cde213fc2909be2389d1b23db0ae4f /libavfilter
parente7e4c8dfbe9d4be289d1181365fa6e5d9fef5349 (diff)
lavfi: pass min explicitly to samples_ready().
Diffstat (limited to 'libavfilter')
-rw-r--r--libavfilter/avfilter.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index c72447d1e0..1023843a7c 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -1178,10 +1178,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);
}
@@ -1194,7 +1194,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);
@@ -1321,7 +1321,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]);
}
}