aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas George <nicolas.george@normalesup.org>2013-03-31 19:28:11 +0200
committerNicolas George <nicolas.george@normalesup.org>2013-04-01 10:38:52 +0200
commit52853077ee49db8ecb6f83d0f9a177708b5d93a6 (patch)
tree2547e3744fd869387cbb78d7d235117be4f13d4f
parent983d04dd40a40d2d099d9c382e84da49fd2fe031 (diff)
downloadffmpeg-52853077ee49db8ecb6f83d0f9a177708b5d93a6.tar.gz
lavfi/af_asetnsamples: fix EOF handling.
Only filter one buffered frame. Correctly return EOF if there is none.
-rw-r--r--libavfilter/af_asetnsamples.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/libavfilter/af_asetnsamples.c b/libavfilter/af_asetnsamples.c
index 08e5279989..e004453642 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;