diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-17 21:50:08 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-17 21:50:08 +0100 |
commit | 80c5dc56104d96eae2d3170720bf5aa4f90467e4 (patch) | |
tree | 1e3a3294aea277f1b8d22ee607dc3cd0094ea9b9 /cmdutils_opencl.c | |
parent | 575ed4fe37fdb1558fbbc261661b6239d47bcd8c (diff) | |
parent | a8765852158ecb2ae34895fa35ff51dc95c186f9 (diff) | |
download | ffmpeg-80c5dc56104d96eae2d3170720bf5aa4f90467e4.tar.gz |
Merge commit 'a8765852158ecb2ae34895fa35ff51dc95c186f9'
* commit 'a8765852158ecb2ae34895fa35ff51dc95c186f9':
movenc: Check memory allocations
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'cmdutils_opencl.c')
0 files changed, 0 insertions, 0 deletions