diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-15 11:56:56 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-15 11:57:02 +0200 |
commit | 61b3b5872019314b1d4160456ce7cf46e3350225 (patch) | |
tree | eeee240f0e63245b89ffc207dacca0ebacece00b /libavfilter/unsharp_opencl_kernel.h | |
parent | 81bbe49a0e588aa899f37a567808ba8926d798d6 (diff) | |
parent | 9997a812e76955b16f3a65bfe6bb6cab87e0ee56 (diff) | |
download | ffmpeg-61b3b5872019314b1d4160456ce7cf46e3350225.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mem: Document the non-compatibility of av_realloc() and av_malloc()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/unsharp_opencl_kernel.h')
0 files changed, 0 insertions, 0 deletions