[opencv] 31/98: Merge pull request #6037 from atinfinity:pullreq/160130-enable-nvcuvid-2.4

[Mattia Rizzolo]

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

mattia pushed a commit to annotated tag 2.4.13
in repository opencv.

commit d6e20974351bcb63fa529da39595c19ab3905ada
Merge: e835878 cf43790
Author: Alexander Alekhin <alexander.alekhin at itseez.com>
Date:   Tue Feb 2 07:09:20 2016 +0000

    Merge pull request #6037 from atinfinity:pullreq/160130-enable-nvcuvid-2.4

 cmake/OpenCVDetectCUDA.cmake     | 13 ++++++++++++-
 cmake/templates/cvconfig.h.in    |  3 +++
 modules/gpu/CMakeLists.txt       |  9 ++++++---
 modules/gpu/src/precomp.hpp      |  4 +++-
 modules/gpu/src/video_writer.cpp |  2 +-
 5 files changed, 25 insertions(+), 6 deletions(-)

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