diff options
author | Liang Qi <liang.qi@qt.io> | 2017-03-10 10:27:27 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-03-10 10:51:09 +0100 |
commit | e964e89331f2cfef99a3f63172a127b6c02a9727 (patch) | |
tree | 4c7d78573d17e523e4278027cee8fa88494366c8 /src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.h | |
parent | f09d36708fdab70ad51af374a65ddded64525f67 (diff) | |
parent | 6f7192a048432e4792330244b74a2a39ccd8d515 (diff) |
Merge remote-tracking branch 'origin/5.8' into 5.9
Conflicts:
src/plugins/gstreamer/camerabin/camerabincontainer.h
Change-Id: I4942d41d69112335fe0c994002f1b32ef3aad051
Diffstat (limited to 'src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.h')
-rw-r--r-- | src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.h b/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.h index 14ef6070f..7f46e8f41 100644 --- a/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.h +++ b/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.h @@ -40,6 +40,7 @@ #ifndef QGSTREAMERPLAYERSESSION_H #define QGSTREAMERPLAYERSESSION_H +#include <QtMultimedia/private/qtmultimediaglobal_p.h> #include <QObject> #include <QtCore/qmutex.h> #include <QtNetwork/qnetworkrequest.h> @@ -49,7 +50,7 @@ #include <qmediastreamscontrol.h> #include <qaudioformat.h> -#if defined(HAVE_GST_APPSRC) +#if QT_CONFIG(gstreamer_app) #include <private/qgstappsrc_p.h> #endif @@ -116,7 +117,7 @@ public: bool processBusMessage(const QGstreamerMessage &message) override; -#if defined(HAVE_GST_APPSRC) +#if QT_CONFIG(gstreamer_app) QGstAppSrc *appsrc() const { return m_appSrc; } static void configureAppSrcElement(GObject*, GObject*, GParamSpec*,QGstreamerPlayerSession* _this); #endif @@ -216,7 +217,7 @@ private: QObject *m_videoOutput; QGstreamerVideoRendererInterface *m_renderer; -#if defined(HAVE_GST_APPSRC) +#if QT_CONFIG(gstreamer_app) QGstAppSrc *m_appSrc; #endif |