Merge pull request #996 from jet47:gpu-nvcuvid-libraries
authorRoman Donchenko <roman.donchenko@itseez.com>
Fri, 14 Jun 2013 12:23:01 +0000 (16:23 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 14 Jun 2013 12:23:02 +0000 (16:23 +0400)

Trivial merge