Commit de95a2b2 authored by Alexander Smorkalov's avatar Alexander Smorkalov

Video IO tests turned off for ARM WinRT.

parent 6f68640d
...@@ -176,7 +176,7 @@ TEST(Highgui_Video, ffmpeg_image) { CV_FFmpegReadImageTest test; test.safe_run() ...@@ -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 ////////////////////////////////////
......
...@@ -48,7 +48,7 @@ ...@@ -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 @@ ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment