diff options
Diffstat (limited to 'tests/auto/unit/qvideoframe/tst_qvideoframe.cpp')
| -rw-r--r-- | tests/auto/unit/qvideoframe/tst_qvideoframe.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/auto/unit/qvideoframe/tst_qvideoframe.cpp b/tests/auto/unit/qvideoframe/tst_qvideoframe.cpp index bcf40a995..943051435 100644 --- a/tests/auto/unit/qvideoframe/tst_qvideoframe.cpp +++ b/tests/auto/unit/qvideoframe/tst_qvideoframe.cpp @@ -33,6 +33,7 @@ #include <qvideoframe.h> #include <QtGui/QImage> #include <QtCore/QPointer> +#include <QtMultimedia/private/qtmultimedia-config_p.h> // Adds an enum, and the stringized version #define ADD_ENUM_TEST(x) \ @@ -1222,7 +1223,7 @@ void tst_QVideoFrame::image_data() << 16384 << 256 << QImage::Format_ARGB32; - +#if !QT_CONFIG(directshow) QTest::newRow("64x64 AYUV444") << QSize(64, 64) << QVideoFrame::Format_AYUV444 @@ -1258,7 +1259,7 @@ void tst_QVideoFrame::image_data() << 256 << QImage::Format_ARGB32; - QTest::newRow("32x256 YUYV") + QTest::newRow("64x64 YUYV") << QSize(64, 64) << QVideoFrame::Format_YUYV << 16384 @@ -1278,6 +1279,7 @@ void tst_QVideoFrame::image_data() << 16384 << 256 << QImage::Format_ARGB32; +#endif } void tst_QVideoFrame::image() |