diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-08 22:48:14 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-08 22:48:14 +0200 |
| commit | 77510a96986176b1be791944861e3a6e44abd3d1 (patch) | |
| tree | 0efb29973242871c14e5bd3908bb621c9a09b6bd /.gitignore | |
| parent | d1f7b313ac3476e4b00f550e470f9f8429919299 (diff) | |
| parent | bc1eace1b3654c490cb2c226b3c80854244dbb9a (diff) | |
| download | ffmpeg-77510a96986176b1be791944861e3a6e44abd3d1.tar.gz | |
Merge commit 'bc1eace1b3654c490cb2c226b3c80854244dbb9a'
* commit 'bc1eace1b3654c490cb2c226b3c80854244dbb9a':
jack: Check memory allocation
Conflicts:
libavdevice/jack.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions