Merge pull request #738 from jet47:gpu-disable-videoenc-test
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Wed, 3 Apr 2013 11:17:53 +0000 (15:17 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 3 Apr 2013 11:17:53 +0000 (15:17 +0400)

Trivial merge