diff options
author | Liang Qi <liang.qi@qt.io> | 2017-03-21 09:29:56 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-03-21 09:29:56 +0100 |
commit | 91c405b5d41232f30fdc3dfd432b057849a26734 (patch) | |
tree | 846932733dec3af5b7361fa237dde30fdb7a9688 /src/plugins/gstreamer/camerabin/camerabinrecorder.h | |
parent | e26e0edd0c3a0e6120008c8a146d8514163930c4 (diff) | |
parent | 086e0b70ac69987441481055a935c31fe89d03f4 (diff) |
Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: Ifd122e78933870e39e0e79d78930931d8ce10dba
Diffstat (limited to 'src/plugins/gstreamer/camerabin/camerabinrecorder.h')
-rw-r--r-- | src/plugins/gstreamer/camerabin/camerabinrecorder.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/gstreamer/camerabin/camerabinrecorder.h b/src/plugins/gstreamer/camerabin/camerabinrecorder.h index 9392f69a5..8bd922fb8 100644 --- a/src/plugins/gstreamer/camerabin/camerabinrecorder.h +++ b/src/plugins/gstreamer/camerabin/camerabinrecorder.h @@ -41,10 +41,11 @@ #ifndef CAMERABINRECORDERCONTROL_H #define CAMERABINRECORDERCONTROL_H +#include <QtMultimedia/private/qtmultimediaglobal_p.h> #include <qmediarecordercontrol.h> #include "camerabinsession.h" -#ifdef HAVE_GST_ENCODING_PROFILES +#if QT_CONFIG(gstreamer_encodingprofiles) #include <gst/pbutils/encoding-profile.h> #endif @@ -71,7 +72,7 @@ public: void applySettings() override; -#ifdef HAVE_GST_ENCODING_PROFILES +#if QT_CONFIG(gstreamer_encodingprofiles) GstEncodingContainerProfile *videoProfile(); #endif |