virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

af_amix: return AVERROR(EAGAIN) when request_frame didn't produce output.

Browse Source 
0 should only be returned when there was at least one output frame.
This commit is contained in:
Anton Khirnov 2012-07-05 20:28:10 +02:00
parent 428b369804
commit 54bf88e65f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavfilter/af_amix.c
View File

@ -409,7 +409,7 @@ static int request_frame(AVFilterLink *outlink)
available_samples = get_available_samples(s); available_samples = get_available_samples(s);
if (!available_samples) if (!available_samples)
return 0; return AVERROR(EAGAIN);
return output_frame(outlink, available_samples); return output_frame(outlink, available_samples);
} }
@ -440,7 +440,7 @@ static int request_frame(AVFilterLink *outlink)
available_samples = get_available_samples(s); available_samples = get_available_samples(s);
if (!available_samples) if (!available_samples)
return 0; return AVERROR(EAGAIN);
available_samples = FFMIN(available_samples, wanted_samples); available_samples = FFMIN(available_samples, wanted_samples);
} else { } else {
available_samples = wanted_samples; available_samples = wanted_samples;