diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-08 11:39:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-08 11:40:56 +0200 |
| commit | 36e4b750a79b4f9592938bacc973f8983f1e18aa (patch) | |
| tree | 81ce3abde44119df8acd45c58af359178cc95835 /cmdutils_opencl.c | |
| parent | f3296b945464b41aa067949b24dfcfeb0db9d875 (diff) | |
| parent | 82f8eb5f773d87e3d9c0066ef19b501a461ddfae (diff) | |
| download | ffmpeg-36e4b750a79b4f9592938bacc973f8983f1e18aa.tar.gz | |
Merge commit '82f8eb5f773d87e3d9c0066ef19b501a461ddfae'
* commit '82f8eb5f773d87e3d9c0066ef19b501a461ddfae':
jpeg2000: split off inverse MCT as Jpeg2000DSP
Conflicts:
libavcodec/Makefile
libavcodec/jpeg2000dec.c
libavcodec/jpeg2000dsp.c
libavcodec/jpeg2000dsp.h
See: c9f2ec8a3464718641742a105179f828ccbfb392
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'cmdutils_opencl.c')
0 files changed, 0 insertions, 0 deletions