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

Video IO tests turned off for ARM WinRT.

Browse Source
This commit is contained in:
Alexander Smorkalov 2013-03-27 00:23:23 -07:00
parent 6f68640d4d
commit de95a2b278
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/highgui/test/test_ffmpeg.cpp
View File

@ -176,7 +176,7 @@ TEST(Highgui_Video, ffmpeg_image) { CV_FFmpegReadImageTest test; test.safe_run()
#endif #endif
#if defined(HAVE_FFMPEG) || defined(WIN32) || defined(_WIN32) #if defined(HAVE_FFMPEG) || ((defined(WIN32) || defined(_WIN32)) && !defined(_M_ARM))
//////////////////////////////// Parallel VideoWriters and VideoCaptures //////////////////////////////////// //////////////////////////////// Parallel VideoWriters and VideoCaptures ////////////////////////////////////

4
modules/highgui/test/test_precomp.hpp
View File

@ -48,7 +48,7 @@
defined(HAVE_AVFOUNDATION) || \ defined(HAVE_AVFOUNDATION) || \
/*defined(HAVE_OPENNI) || too specialized */ \ /*defined(HAVE_OPENNI) || too specialized */ \
defined(HAVE_FFMPEG) || \ defined(HAVE_FFMPEG) || \
defined(WIN32) /* assume that we have ffmpeg */ (defined(WIN32) && !defined(_M_ARM))/* assume that we have ffmpeg on x86 and no on ARM */
# define BUILD_WITH_VIDEO_INPUT_SUPPORT 1 # define BUILD_WITH_VIDEO_INPUT_SUPPORT 1
#else #else
@ -60,7 +60,7 @@
defined(HAVE_QUICKTIME) || \ defined(HAVE_QUICKTIME) || \
defined(HAVE_AVFOUNDATION) || \ defined(HAVE_AVFOUNDATION) || \
defined(HAVE_FFMPEG) || \ defined(HAVE_FFMPEG) || \
defined(WIN32) /* assume that we have ffmpeg */ (defined(WIN32) && !defined(_M_ARM)) /* assume that we have ffmpeg */
# define BUILD_WITH_VIDEO_OUTPUT_SUPPORT 1 # define BUILD_WITH_VIDEO_OUTPUT_SUPPORT 1
#else #else
# define BUILD_WITH_VIDEO_OUTPUT_SUPPORT 0 # define BUILD_WITH_VIDEO_OUTPUT_SUPPORT 0