Merge commit 'bc1eace1b3654c490cb2c226b3c80854244dbb9a'

* commit 'bc1eace1b3654c490cb2c226b3c80854244dbb9a':
  jack: Check memory allocation

Conflicts:
	libavdevice/jack.c

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

libavdevice/jack.c

@@ -200,6 +200,10 @@ static int start_jack(AVFormatContext *context)
     self->filled_pkts = av_fifo_alloc_array(FIFO_PACKETS_NUM, sizeof(AVPacket));
     /* New packets FIFO with one extra packet for safety against underruns */
     self->new_pkts    = av_fifo_alloc_array((FIFO_PACKETS_NUM + 1), sizeof(AVPacket));
+    if (!self->new_pkts) {
+        jack_client_close(self->client);
+        return AVERROR(ENOMEM);
+    }
     if ((test = supply_new_packets(self, context))) {
         jack_client_close(self->client);
         return test;