Merge pull request #2258 from ilya-lavrenov:tapi_video
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Mon, 3 Feb 2014 10:17:49 +0000 (14:17 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 3 Feb 2014 10:17:49 +0000 (14:17 +0400)
commita2fcaccf8b138d72af1e506cb75f37b43144d061
treef9e9e545298029d67ae68608bf9fbb02c3f827c9
parentcb1e4b2edecaca584003c6cb5b1e8d9912da6fa2
parent31b7cdc695a060509399b092b837757e0a8f3f16
Merge pull request #2258 from ilya-lavrenov:tapi_video