aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil/opencl.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-05-06 03:34:04 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-05-06 03:34:18 +0200
commit843b860ad974752ef3fe00c75081c3bda3b56a97 (patch)
tree948bd0533f8c92ec1423ce2b34a325d54f4b1e14 /libavutil/opencl.h
parent97d7c8d5848899797ce657f50a1f7aa49c2955cd (diff)
parent41a89cba6086de2bd24f9ec7e21200fa162505e9 (diff)
downloadffmpeg-843b860ad974752ef3fe00c75081c3bda3b56a97.tar.gz
Merge commit '41a89cba6086de2bd24f9ec7e21200fa162505e9' into release/2.4
* commit '41a89cba6086de2bd24f9ec7e21200fa162505e9': alsdec: check sample pointer range in revert_channel_correlation Conflicts: libavcodec/alsdec.c See: afc7748d1f6abc4b3b1cc957b0fa6941837db3d0 Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/opencl.h')
0 files changed, 0 insertions, 0 deletions