Merge pull request #7769 from alalek:cmake_ffmpeg_cleanup

author Alexander Alekhin <alexander.a.alekhin@gmail.com>

Thu, 1 Dec 2016 20:24:05 +0000 (20:24 +0000)

committer Alexander Alekhin <alexander.a.alekhin@gmail.com>

Thu, 1 Dec 2016 20:24:05 +0000 (20:24 +0000)
author Alexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 1 Dec 2016 20:24:05 +0000 (20:24 +0000)
committer Alexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 1 Dec 2016 20:24:05 +0000 (20:24 +0000)
diff --cc CMakeLists.txt
Simple merge
diff --cc cmake/OpenCVUtils.cmake
Simple merge
author	Alexander Alekhin <alexander.a.alekhin@gmail.com>
	Thu, 1 Dec 2016 20:24:05 +0000 (20:24 +0000)
committer	Alexander Alekhin <alexander.a.alekhin@gmail.com>
	Thu, 1 Dec 2016 20:24:05 +0000 (20:24 +0000)
		1	2
CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
cmake/OpenCVUtils.cmake	patch \|	diff1 \|	diff2 \|	blob \| history