[opencv] 57/89: Merge pull request #7743 from alalek:cmake_ffmpeg_cleanup_2.4

[Nobuhiro Iwamatsu]

This is an automated email from the git hooks/post-receive script.

iwamatsu pushed a commit to annotated tag 2.4.13.2
in repository opencv.

commit 3d8395cae93f1054981a347c54c3888c28c12cbc
Merge: 2af4dc7 32f5683
Author: Vadim Pisarevsky <vadim.pisarevsky at gmail.com>
Date:   Tue Nov 29 17:35:12 2016 +0000

    Merge pull request #7743 from alalek:cmake_ffmpeg_cleanup_2.4

 3rdparty/ffmpeg/ffmpeg_version.cmake    | 22 +++++-----
 CMakeLists.txt                          | 15 ++++---
 cmake/OpenCVFindLibsVideo.cmake         | 72 ++++++++++-----------------------
 cmake/OpenCVUtils.cmake                 | 38 +++++++++++++++++
 cmake/checks/ffmpeg_test.cpp            | 24 +++++++++++
 cmake/templates/cvconfig.h.in           |  6 ---
 modules/highgui/src/cap_ffmpeg_impl.hpp |  3 ++
 7 files changed, 104 insertions(+), 76 deletions(-)


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/opencv.git