diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-04-28 20:49:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-08-23 13:15:16 +0200 |
| commit | 0fb30a9744dd48f066762b4cba1aa5fc9bbd394a (patch) | |
| tree | 6ae284c904e4e6126d908149717ac534068bb22e | |
| parent | 0f0173554e67bc66273e6d7958766aed1375a006 (diff) | |
| download | ffmpeg-0fb30a9744dd48f066762b4cba1aa5fc9bbd394a.tar.gz | |
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 abc957e896beb3ce33c5691b9b3701993a381852)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavfilter/af_amix.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavfilter/af_amix.c b/libavfilter/af_amix.c index afd7f7eace..fddf1fe0e1 100644 --- a/libavfilter/af_amix.c +++ b/libavfilter/af_amix.c @@ -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); |