asyncts: fix flushing of final samples at EOF
authorJustin Ruggles <justin.ruggles@gmail.com>
Wed, 12 Dec 2012 18:10:13 +0000 (13:10 -0500)
committerJustin Ruggles <justin.ruggles@gmail.com>
Thu, 13 Dec 2012 18:02:21 +0000 (13:02 -0500)
libavfilter/af_asyncts.c

index 5d009f0..67f3c4f 100644 (file)
@@ -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;