[FFmpeg-cvslog] lavfi/af_asetnsamples: fix EOF handling.

Nicolas George git at videolan.org
Mon Apr 1 15:19:30 CEST 2013


ffmpeg | branch: master | Nicolas George <nicolas.george at normalesup.org> | Sun Mar 31 19:28:11 2013 +0200| [52853077ee49db8ecb6f83d0f9a177708b5d93a6] | committer: Nicolas George

lavfi/af_asetnsamples: fix EOF handling.

Only filter one buffered frame.
Correctly return EOF if there is none.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=52853077ee49db8ecb6f83d0f9a177708b5d93a6
---

 libavfilter/af_asetnsamples.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/libavfilter/af_asetnsamples.c b/libavfilter/af_asetnsamples.c
index 08e5279..e004453 100644
--- a/libavfilter/af_asetnsamples.c
+++ b/libavfilter/af_asetnsamples.c
@@ -171,9 +171,8 @@ static int request_frame(AVFilterLink *outlink)
     } while (!asns->req_fullfilled && ret >= 0);
 
     if (ret == AVERROR_EOF) {
-        do {
-            ret = push_samples(outlink);
-        } while (ret > 0);
+        ret = push_samples(outlink);
+        return ret < 0 ? ret : ret > 0 ? 0 : AVERROR_EOF;
     }
 
     return ret;



More information about the ffmpeg-cvslog mailing list