Merge commit '62549f9655c48f0ec061087fa33a96040ce01145'

[ffmpeg] / libavfilter / af_aconvert.c

diff --git a/libavfilter/af_aconvert.c b/libavfilter/af_aconvert.c
index c05e5719a325f2fa6c7ed21ba991e9630fe32c8a..1fc06f208592a36a18a8c563368e5c2a73dbd4ad 100644 (file)
--- a/libavfilter/af_aconvert.c
+++ b/libavfilter/af_aconvert.c
@@ -143,6 +143,8 @@ static int  filter_frame(AVFilterLink *inlink, AVFrame *insamplesref)
     AVFrame *outsamplesref = ff_get_audio_buffer(outlink, n);
     int ret;
 
+    if (!outsamplesref)
+        return AVERROR(ENOMEM);
     swr_convert(aconvert->swr, outsamplesref->extended_data, n,
                         (void *)insamplesref->extended_data, n);