[FFmpeg-cvslog] avfilter/af_amix: dont fail if there are no samples in output_frame()

[Michael Niedermayer]

ffmpeg | branch: release/3.0 | Michael Niedermayer <michael at niedermayer.cc> | Thu Apr 28 20:49:13 2016 +0200| [b2a2b1a88b3e3c78e8732bceab717910bd3eba09] | committer: Michael Niedermayer

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

Fixes Ticket5326

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

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b2a2b1a88b3e3c78e8732bceab717910bd3eba09
---

 libavfilter/af_amix.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavfilter/af_amix.c b/libavfilter/af_amix.c
index e64e289..3e5e7ee 100644
--- a/libavfilter/af_amix.c
+++ b/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);