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

Revert "disabled video decoding under linux"

Browse Source 
This reverts commit 889674ef43.
This commit is contained in:
vlad
2012-12-20 13:31:22 +04:00
committed by Vladislav Vinogradov
parent 660d23aa04
commit 11293d071f
17 changed files with 40 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/gpu/perf/perf_video.cpp
View File

@@ -1045,12 +1045,10 @@ PERF_TEST_P(Video_Cn_MaxFeatures, DISABLED_Video_GMG,
}
}
#ifdef WIN32
//////////////////////////////////////////////////////
// VideoWriter
PERF_TEST_P(Video, Video_VideoWriter, Values("gpu/video/768x576.avi", "gpu/video/1920x1080.avi"))
PERF_TEST_P(Video, DISABLED_Video_VideoWriter, Values("gpu/video/768x576.avi", "gpu/video/1920x1080.avi"))
{
declare.time(30);
@@ -1147,6 +1145,4 @@ PERF_TEST_P(Video, Video_VideoReader, Values("gpu/video/768x576.avi", "gpu/video
}
}
#endif
} // namespace