Merge commit 'bc1eace1b3654c490cb2c226b3c80854244dbb9a'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 8 Jun 2015 20:48:14 +0000 (22:48 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 8 Jun 2015 20:48:14 +0000 (22:48 +0200)
commit77510a96986176b1be791944861e3a6e44abd3d1
tree0efb29973242871c14e5bd3908bb621c9a09b6bd
parentd1f7b313ac3476e4b00f550e470f9f8429919299
parentbc1eace1b3654c490cb2c226b3c80854244dbb9a
Merge commit 'bc1eace1b3654c490cb2c226b3c80854244dbb9a'

* commit 'bc1eace1b3654c490cb2c226b3c80854244dbb9a':
  jack: Check memory allocation

Conflicts:
libavdevice/jack.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavdevice/jack.c