Commit 76fd8145 authored by Michael Niedermayer's avatar Michael Niedermayer

avfilter/af_amix: dont fail if there are no samples in output_frame()

Fixes Ticket5326
Signed-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit abc957e8)
Signed-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parent 5af0ada4
...@@ -276,6 +276,9 @@ static int output_frame(AVFilterLink *outlink, int nb_samples) ...@@ -276,6 +276,9 @@ static int output_frame(AVFilterLink *outlink, int nb_samples)
calculate_scales(s, nb_samples); calculate_scales(s, nb_samples);
if (nb_samples == 0)
return 0;
out_buf = ff_get_audio_buffer(outlink, nb_samples); out_buf = ff_get_audio_buffer(outlink, nb_samples);
if (!out_buf) if (!out_buf)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment