Merge pull request #680 from vpisarev:c2cpp_video_take2
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Fri, 22 Mar 2013 15:34:52 +0000 (19:34 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 22 Mar 2013 15:34:53 +0000 (19:34 +0400)
commit82d7292ee7d07197c4ea06de4bb5601fc6541f7a
treea0612722ef17456be3eaf963943770e07ed1200c
parent1ca8f33b4e89b5ef065c27312c48c8849d675d69
parent40dd25d6c2bbdbf662e91a16ddc0464f1c6a109e
Merge pull request #680 from vpisarev:c2cpp_video_take2
modules/gpu/perf/perf_video.cpp
modules/gpu/test/test_bgfg.cpp
modules/python/src2/cv2.cpp
samples/cpp/bgfg_gmg.cpp
samples/cpp/bgfg_segm.cpp
samples/gpu/performance/tests.cpp