Merge commit '386e2755aab73ae7075f78d92786cb5c5419597a'

* commit '386e2755aab73ae7075f78d92786cb5c5419597a':
  jack: Check memory allocation

Conflicts:
	libavdevice/jack.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavdevice/jack.c

@@ -165,6 +165,8 @@ static int start_jack(AVFormatContext *context)
 
     self->sample_rate = jack_get_sample_rate(self->client);
     self->ports       = av_malloc_array(self->nports, sizeof(*self->ports));
+    if (!self->ports)
+        return AVERROR(ENOMEM);
     self->buffer_size = jack_get_buffer_size(self->client);
 
     /* Register JACK ports */