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)
commitea79357fd32a239c169a26a886f81f6b55231eb1
tree8fd71f71eb256bcb3ea09e2a315ad3517fe2f36c
parent1eb34e062c42df60c5399ad2179208d12e20aa5f
parent14d27112e9856a0fd0af8c680071f038867cc721
Merge pull request #647 from taka-no-me:fix_ffmpeg_wrapper