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>
Michael Niedermayer 9 years ago
parent
commit
abc957e896
1 changed files with 3 additions and 0 deletions
  1. 3 0
      libavfilter/af_amix.c

+ 3 - 0
libavfilter/af_amix.c

@@ -312,6 +312,9 @@ static int output_frame(AVFilterLink *outlink)
 
     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);