projects / platform / upstream / opencv.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2af4dc7 32f5683)
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)
1  2 
CMakeLists.txt patch | diff1 | diff2 | blob | history
cmake/OpenCVUtils.cmake patch | diff1 | diff2 | blob | history

diff --cc CMakeLists.txt
Simple merge
diff --cc cmake/OpenCVUtils.cmake
Simple merge
Domain: Multimedia / Media Vision;