ffmpeg/libavdevice
Michael Niedermayer 1c667626bb Merge commit '386e2755aab73ae7075f78d92786cb5c5419597a'
* commit '386e2755aab73ae7075f78d92786cb5c5419597a':
  jack: Check memory allocation

Conflicts:
	libavdevice/jack.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-20 12:46:29 +02:00
..
2015-01-26 02:04:30 -07:00
2015-01-26 02:04:30 -07:00
2012-12-21 00:18:34 +01:00
2015-03-06 21:35:00 +01:00
2014-08-30 18:02:45 +02:00