Browse Source

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.
tags/n1.0
Anton Khirnov 13 years ago
parent
commit
54bf88e65f
1 changed files with 2 additions and 2 deletions
  1. +2
    -2
      libavfilter/af_amix.c

+ 2
- 2
libavfilter/af_amix.c View File

@@ -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;


Loading…
Cancel
Save