diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-20 12:46:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-20 12:46:29 +0200 |
| commit | 1c667626bbbf1e7bde9e7be8cf1a00d0f61580df (patch) | |
| tree | 3a156a704767e8772e923a55e334474c71bde4b0 /libswresample | |
| parent | a6df9ce61520ad7583a90a20e82d857b8d4fb133 (diff) | |
| parent | 386e2755aab73ae7075f78d92786cb5c5419597a (diff) | |
| download | ffmpeg-1c667626bbbf1e7bde9e7be8cf1a00d0f61580df.tar.gz | |
Merge commit '386e2755aab73ae7075f78d92786cb5c5419597a'
* commit '386e2755aab73ae7075f78d92786cb5c5419597a':
jack: Check memory allocation
Conflicts:
libavdevice/jack.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample')
0 files changed, 0 insertions, 0 deletions