Merge pull request #1195 from jet47:gpucodec-remove-ffmpeg-dep
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Tue, 30 Jul 2013 14:22:08 +0000 (18:22 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 30 Jul 2013 14:22:08 +0000 (18:22 +0400)

Trivial merge