Merge pull request #578 from jet47:nmake-ffmpeg-copy
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Thu, 28 Feb 2013 08:56:26 +0000 (12:56 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 28 Feb 2013 08:56:26 +0000 (12:56 +0400)

Trivial merge