Browse Source

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

Fixes Ticket5326

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit abc957e896)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
tags/n2.8.8
Michael Niedermayer 9 years ago
parent
commit
76fd8145a1
1 changed files with 3 additions and 0 deletions
  1. +3
    -0
      libavfilter/af_amix.c

+ 3
- 0
libavfilter/af_amix.c View File

@@ -276,6 +276,9 @@ static int output_frame(AVFilterLink *outlink, int nb_samples)

calculate_scales(s, nb_samples);

if (nb_samples == 0)
return 0;

out_buf = ff_get_audio_buffer(outlink, nb_samples);
if (!out_buf)
return AVERROR(ENOMEM);


Loading…
Cancel
Save