summaryrefslogtreecommitdiff
path: root/libavfilter/af_amix.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2012-07-05 20:28:10 +0200
committerAnton Khirnov <anton@khirnov.net>2012-07-06 13:51:58 +0200
commit54bf88e65fe2d87a41abcbee33392725ebe2f0a0 (patch)
tree641869cea29cf3c6dec4cad9bb45850b97aedbc7 /libavfilter/af_amix.c
parent428b369804d1a0ea7212409e800324ce284e9d55 (diff)
af_amix: return AVERROR(EAGAIN) when request_frame didn't produce output.
0 should only be returned when there was at least one output frame.
Diffstat (limited to 'libavfilter/af_amix.c')
-rw-r--r--libavfilter/af_amix.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavfilter/af_amix.c b/libavfilter/af_amix.c
index a8ec8a194f..deeaa036ac 100644
--- a/libavfilter/af_amix.c
+++ b/libavfilter/af_amix.c
@@ -409,7 +409,7 @@ static int request_frame(AVFilterLink *outlink)
available_samples = get_available_samples(s);
if (!available_samples)
- return 0;
+ return AVERROR(EAGAIN);
return output_frame(outlink, available_samples);
}
@@ -440,7 +440,7 @@ static int request_frame(AVFilterLink *outlink)
available_samples = get_available_samples(s);
if (!available_samples)
- return 0;
+ return AVERROR(EAGAIN);
available_samples = FFMIN(available_samples, wanted_samples);
} else {
available_samples = wanted_samples;