From 7ce83f2a9548549d2a6718de598f7f338b0cb90e Mon Sep 17 00:00:00 2001 From: cudawarped <12133430+cudawarped@users.noreply.github.com> Date: Wed, 3 Aug 2022 09:41:06 +0300 Subject: [PATCH] Skip new test until pr built into windows ffmpeg dll. --- modules/videoio/test/test_ffmpeg.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/modules/videoio/test/test_ffmpeg.cpp b/modules/videoio/test/test_ffmpeg.cpp index f59631cfc4..5001bcf796 100644 --- a/modules/videoio/test/test_ffmpeg.cpp +++ b/modules/videoio/test/test_ffmpeg.cpp @@ -408,11 +408,16 @@ TEST_P(ffmpeg_get_fourcc, check_short_codecs) if (!videoio_registry::hasBackend(api)) throw SkipTestException("Backend was not found"); const string fileName = get<0>(GetParam()); - const string fourcc = get<1>(GetParam()); + const string fourcc_string = get<1>(GetParam()); VideoCapture cap(findDataFile(fileName), api); if (!cap.isOpened()) throw SkipTestException("Video stream is not supported"); - ASSERT_EQ(fourccToString(cap.get(CAP_PROP_FOURCC)), fourcc); + const double fourcc = cap.get(CAP_PROP_FOURCC); +#ifdef _WIN32 // handle old FFmpeg backend + if(!fourcc && fileName == "../cv/tracking/faceocc2/data/faceocc2.webm") + throw SkipTestException("Feature not yet supported by Windows FFmpeg shared library!"); +#endif + ASSERT_EQ(fourccToString(fourcc), fourcc_string); } const ffmpeg_get_fourcc_param_t ffmpeg_get_fourcc_param[] =