4036f6a3d0
Conflicts: apps/CMakeLists.txt modules/contrib/CMakeLists.txt modules/core/include/opencv2/core/version.hpp modules/imgproc/include/opencv2/imgproc/imgproc.hpp modules/java/generator/gen_java.py modules/ocl/include/opencv2/ocl/ocl.hpp modules/ocl/src/cl_runtime/cl_runtime.cpp modules/ocl/src/columnsum.cpp modules/ocl/src/filtering.cpp modules/ocl/src/imgproc.cpp modules/ocl/test/main.cpp modules/ocl/test/test_color.cpp modules/ocl/test/test_imgproc.cpp samples/gpu/CMakeLists.txt
12 lines
314 B
CMake
12 lines
314 B
CMake
set(HAVE_FFMPEG 1)
|
|
set(HAVE_FFMPEG_CODEC 1)
|
|
set(HAVE_FFMPEG_FORMAT 1)
|
|
set(HAVE_FFMPEG_UTIL 1)
|
|
set(HAVE_FFMPEG_SWSCALE 1)
|
|
set(HAVE_GENTOO_FFMPEG 1)
|
|
|
|
set(ALIASOF_libavcodec_VERSION 55.18.102)
|
|
set(ALIASOF_libavformat_VERSION 55.12.100)
|
|
set(ALIASOF_libavutil_VERSION 52.38.100)
|
|
set(ALIASOF_libswscale_VERSION 2.3.100)
|