Merge pull request #7743 from alalek:cmake_ffmpeg_cleanup_2.4
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 29 Nov 2016 17:35:12 +0000 (17:35 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 29 Nov 2016 17:35:12 +0000 (17:35 +0000)
commit3d8395cae93f1054981a347c54c3888c28c12cbc
tree9287d60359165a1894e384c31e80a39ef142da34
parent2af4dc7249fc24078f1742fbe78b65b759727d09
parent32f568308a9022419aa6e1c4cb0c6989b9ab559e
Merge pull request #7743 from alalek:cmake_ffmpeg_cleanup_2.4
CMakeLists.txt
cmake/OpenCVUtils.cmake