[FFmpeg-cvslog] Merge commit '386e2755aab73ae7075f78d92786cb5c5419597a'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Apr 20 12:46:29 2015 +0200| [1c667626bbbf1e7bde9e7be8cf1a00d0f61580df] | committer: Michael Niedermayer

Merge commit '386e2755aab73ae7075f78d92786cb5c5419597a'

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

Conflicts:
	libavdevice/jack.c

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1c667626bbbf1e7bde9e7be8cf1a00d0f61580df
---