Merge pull request #647 from taka-no-me:fix_ffmpeg_wrapper
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Fri, 15 Mar 2013 13:50:32 +0000 (17:50 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 15 Mar 2013 13:50:32 +0000 (17:50 +0400)

Trivial merge