diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-16 03:00:46 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-16 03:00:47 +0100 |
| commit | 4077428310aefb64b8030ea0da00343afc986e1a (patch) | |
| tree | d5bb59a63a5862559af7f54bd348a08dc193be7b | |
| parent | 7dc8468682e88dd218a6a7c424d666c3c834227c (diff) | |
| parent | 4e47d0a710452cfba62a8a3c2c2ce5c118bc00fe (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I947a3b4aaf39e56b9505ae802b8b31c718922639
| -rw-r--r-- | src/gsttools/qgstutils.cpp | 8 | ||||
| -rw-r--r-- | src/multimediawidgets/qvideowidget.cpp | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/gsttools/qgstutils.cpp b/src/gsttools/qgstutils.cpp index bce453ac1..06f277766 100644 --- a/src/gsttools/qgstutils.cpp +++ b/src/gsttools/qgstutils.cpp @@ -1370,8 +1370,7 @@ void QGstUtils::setMetaData(GstBin *bin, const QMap<QByteArray, QVariant> &data) GstCaps *QGstUtils::videoFilterCaps() { - static GstStaticCaps staticCaps = { - NULL, + const char *caps = #if GST_CHECK_VERSION(1,2,0) "video/x-raw(ANY);" #elif GST_CHECK_VERSION(1,0,0) @@ -1383,9 +1382,8 @@ GstCaps *QGstUtils::videoFilterCaps() "video/x-android-buffer;" #endif "image/jpeg;" - "video/x-h264", - GST_PADDING_INIT - }; + "video/x-h264"; + static GstStaticCaps staticCaps = GST_STATIC_CAPS(caps); return gst_caps_make_writable(gst_static_caps_get(&staticCaps)); } diff --git a/src/multimediawidgets/qvideowidget.cpp b/src/multimediawidgets/qvideowidget.cpp index ee40151af..7d26a8534 100644 --- a/src/multimediawidgets/qvideowidget.cpp +++ b/src/multimediawidgets/qvideowidget.cpp @@ -57,6 +57,10 @@ #include <qwindow.h> #include <private/qhighdpiscaling_p.h> +#ifdef Q_OS_WIN +#include <QtCore/qt_windows.h> +#endif + using namespace Qt; QT_BEGIN_NAMESPACE |