From: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date: Wed, 27 Mar 2013 07:23:23 +0000 (-0700)
Subject: Video IO tests turned off for ARM WinRT.
X-Git-Tag: accepted/tizen/ivi/20140515.103456~1^2~857^2~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=de95a2b278657d06d85cd032fd3fa6fe2f55eda2;p=profile%2Fivi%2Fopencv.git

Video IO tests turned off for ARM WinRT.
---

diff --git a/modules/highgui/test/test_ffmpeg.cpp b/modules/highgui/test/test_ffmpeg.cpp
index 5306546..547060e 100644
--- a/modules/highgui/test/test_ffmpeg.cpp
+++ b/modules/highgui/test/test_ffmpeg.cpp
@@ -176,7 +176,7 @@ TEST(Highgui_Video, ffmpeg_image) { CV_FFmpegReadImageTest test; test.safe_run()
 
 #endif
 
-#if defined(HAVE_FFMPEG) || defined(WIN32) || defined(_WIN32)
+#if defined(HAVE_FFMPEG) || ((defined(WIN32) || defined(_WIN32)) && !defined(_M_ARM))
 
 //////////////////////////////// Parallel VideoWriters and VideoCaptures ////////////////////////////////////
 
diff --git a/modules/highgui/test/test_precomp.hpp b/modules/highgui/test/test_precomp.hpp
index 3286c0f..bdf3f38 100644
--- a/modules/highgui/test/test_precomp.hpp
+++ b/modules/highgui/test/test_precomp.hpp
@@ -48,7 +48,7 @@
     defined(HAVE_AVFOUNDATION) || \
     /*defined(HAVE_OPENNI)     || too specialized */ \
     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
 #else
@@ -60,7 +60,7 @@
     defined(HAVE_QUICKTIME)    || \
     defined(HAVE_AVFOUNDATION) || \
     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
 #else
 #  define BUILD_WITH_VIDEO_OUTPUT_SUPPORT 0