generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

disabled video decoding under linux

Browse Source
This commit is contained in:
Vladislav Vinogradov
2012-12-13 13:48:24 +04:00
parent 5ddf4e4ed7
commit 889674ef43
17 changed files with 30 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/gpu/test/test_video.cpp
View File

@@ -868,11 +868,11 @@ INSTANTIATE_TEST_CASE_P(GPU_Video, GMG, testing::Combine(
testing::Values(Channels(1), Channels(3), Channels(4)),
WHOLE_SUBMAT));
#ifdef WIN32
//////////////////////////////////////////////////////
// VideoWriter
#ifdef WIN32
PARAM_TEST_CASE(VideoWriter, cv::gpu::DeviceInfo, std::string)
{
cv::gpu::DeviceInfo devInfo;
@@ -934,8 +934,6 @@ INSTANTIATE_TEST_CASE_P(GPU_Video, VideoWriter, testing::Combine(
ALL_DEVICES,
testing::Values(std::string("768x576.avi"), std::string("1920x1080.avi"))));
#endif // WIN32
//////////////////////////////////////////////////////
// VideoReader
@@ -976,4 +974,6 @@ INSTANTIATE_TEST_CASE_P(GPU_Video, VideoReader, testing::Combine(
ALL_DEVICES,
testing::Values(std::string("768x576.avi"), std::string("1920x1080.avi"))));
#endif // WIN32
#endif // HAVE_CUDA