Merge commit '111367263af41c88a44bd763ceefc11d53a7f655'

[ffmpeg] / libavfilter / af_pan.c

diff --git a/libavfilter/af_pan.c b/libavfilter/af_pan.c
index ae2e0aa4810d5160071250aff92d6f112f4c68fe..038a8a1157e5dddb53dbfd264e73e54e4d9a4c4f 100644 (file)
--- a/libavfilter/af_pan.c
+++ b/libavfilter/af_pan.c
@@ -361,6 +361,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamples)
     AVFrame *outsamples = ff_get_audio_buffer(outlink, n);
     PanContext *pan = inlink->dst->priv;
 
+    if (!outsamples)
+        return AVERROR(ENOMEM);
     swr_convert(pan->swr, outsamples->data, n, (void *)insamples->data, n);
     av_frame_copy_props(outsamples, insamples);
     outsamples->channel_layout = outlink->channel_layout;