ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Mon Jun 8
22:48:14 2015 +0200| [77510a96986176b1be791944861e3a6e44abd3d1] | committer:
Michael Niedermayer
Merge commit 'bc1eace1b3654c490cb2c226b3c80854244dbb9a'
* commit 'bc1eace1b3654c490cb2c226b3c80854244dbb9a':
jack: Check memory allocation
Conflicts:
libavdevice/jack.c
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=77510a96986176b1be791944861e3a6e44abd3d1
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
