[opencv] 03/89: Merge pull request #7314 from alalek:backport_7266

[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 9ff63a46fcfe784e6465320af80624a53a98ccaa
Merge: d68e350 c314178
Author: Vadim Pisarevsky <vadim.pisarevsky at gmail.com>
Date:   Thu Sep 22 11:28:46 2016 +0000

    Merge pull request #7314 from alalek:backport_7266

 CMakeLists.txt                              |   20 +-
 cmake/OpenCVFindLibsVideo.cmake             |   23 +-
 modules/highgui/CMakeLists.txt              |    9 +-
 modules/highgui/src/cap_avfoundation_mac.mm | 1354 +++++++++++++++++++++++++++
 4 files changed, 1383 insertions(+), 23 deletions(-)

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