From f266486b2e71d2965a19a505e83ead3cc1b198e0 Mon Sep 17 00:00:00 2001
From: Justin Ruggles <justin.ruggles@gmail.com>
Date: Wed, 12 Dec 2012 13:10:13 -0500
Subject: [PATCH] asyncts: fix flushing of final samples at EOF
---
libavfilter/af_asyncts.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/libavfilter/af_asyncts.c b/libavfilter/af_asyncts.c
index 5d009f020b6..67f3c4fdde8 100644
--- a/libavfilter/af_asyncts.c
+++ b/libavfilter/af_asyncts.c
@@ -116,6 +116,12 @@ static int config_props(AVFilterLink *link)
return 0;
}
+/* get amount of data currently buffered, in samples */
+static int64_t get_delay(ASyncContext *s)
+{
+ return avresample_available(s->avr) + avresample_get_delay(s->avr);
+}
+
static int request_frame(AVFilterLink *link)
{
AVFilterContext *ctx = link->src;
@@ -128,7 +134,7 @@ static int request_frame(AVFilterLink *link)
ret = ff_request_frame(ctx->inputs[0]);
/* flush the fifo */
- if (ret == AVERROR_EOF && (nb_samples = avresample_get_delay(s->avr))) {
+ if (ret == AVERROR_EOF && (nb_samples = get_delay(s))) {
AVFilterBufferRef *buf = ff_get_audio_buffer(link, AV_PERM_WRITE,
nb_samples);
if (!buf)
@@ -155,12 +161,6 @@ static int write_to_fifo(ASyncContext *s, AVFilterBufferRef *buf)
return ret;
}
-/* get amount of data currently buffered, in samples */
-static int64_t get_delay(ASyncContext *s)
-{
- return avresample_available(s->avr) + avresample_get_delay(s->avr);
-}
-
static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *buf)
{
AVFilterContext *ctx = inlink->dst;
--
GitLab