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/camerabin/camerabincontainer.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/camerabin/camerabincontainer.h')
| -rw-r--r-- | src/plugins/gstreamer/camerabin/camerabincontainer.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/plugins/gstreamer/camerabin/camerabincontainer.h b/src/plugins/gstreamer/camerabin/camerabincontainer.h index b9b7f1214..738e55e2a 100644 --- a/src/plugins/gstreamer/camerabin/camerabincontainer.h +++ b/src/plugins/gstreamer/camerabin/camerabincontainer.h @@ -41,6 +41,7 @@ #ifndef CAMERABINMEDIACONTAINERCONTROL_H #define CAMERABINMEDIACONTAINERCONTROL_H +#include <QtMultimedia/private/qtmultimediaglobal_p.h> #include <qmediacontainercontrol.h> #include <QtCore/qstringlist.h> #include <QtCore/qset.h> @@ -48,7 +49,7 @@ #include <gst/gst.h> #include <gst/pbutils/pbutils.h> -#ifdef HAVE_GST_ENCODING_PROFILES +#if QT_CONFIG(gstreamer_encodingprofiles) #include <gst/pbutils/encoding-profile.h> #include <private/qgstcodecsinfo_p.h> #endif @@ -72,7 +73,7 @@ public: void setActualContainerFormat(const QString &containerFormat); void resetActualContainerFormat(); -#ifdef HAVE_GST_ENCODING_PROFILES +#if QT_CONFIG(gstreamer_encodingprofiles) GstEncodingContainerProfile *createProfile(); #endif @@ -83,7 +84,7 @@ private: QString m_format; QString m_actualFormat; -#ifdef HAVE_GST_ENCODING_PROFILES +#if QT_CONFIG(gstreamer_encodingprofiles) QGstCodecsInfo m_supportedContainers; #endif }; |