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.cpp | |
| 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.cpp')
| -rw-r--r-- | src/plugins/gstreamer/camerabin/camerabincontainer.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/plugins/gstreamer/camerabin/camerabincontainer.cpp b/src/plugins/gstreamer/camerabin/camerabincontainer.cpp index e424f92a1..0fc51611e 100644 --- a/src/plugins/gstreamer/camerabin/camerabincontainer.cpp +++ b/src/plugins/gstreamer/camerabin/camerabincontainer.cpp @@ -37,6 +37,7 @@ ** ****************************************************************************/ +#include <QtMultimedia/private/qtmultimediaglobal_p.h> #include "camerabincontainer.h" #include <QtCore/qregexp.h> #include <private/qgstutils_p.h> @@ -47,7 +48,7 @@ QT_BEGIN_NAMESPACE CameraBinContainer::CameraBinContainer(QObject *parent) :QMediaContainerControl(parent) -#ifdef HAVE_GST_ENCODING_PROFILES +#if QT_CONFIG(gstreamer_encodingprofiles) , m_supportedContainers(QGstCodecsInfo::Muxer) #endif { @@ -55,7 +56,7 @@ CameraBinContainer::CameraBinContainer(QObject *parent) QStringList CameraBinContainer::supportedContainers() const { -#ifdef HAVE_GST_ENCODING_PROFILES +#if QT_CONFIG(gstreamer_encodingprofiles) return m_supportedContainers.supportedCodecs(); #else return QStringList(); @@ -64,7 +65,7 @@ QStringList CameraBinContainer::supportedContainers() const QString CameraBinContainer::containerDescription(const QString &formatMimeType) const { -#ifdef HAVE_GST_ENCODING_PROFILES +#if QT_CONFIG(gstreamer_encodingprofiles) return m_supportedContainers.codecDescription(formatMimeType); #else Q_UNUSED(formatMimeType) @@ -79,7 +80,7 @@ QString CameraBinContainer::containerFormat() const void CameraBinContainer::setContainerFormat(const QString &format) { -#ifdef HAVE_GST_ENCODING_PROFILES +#if QT_CONFIG(gstreamer_encodingprofiles) if (m_format != format) { m_format = format; m_actualFormat = format; @@ -95,7 +96,7 @@ QString CameraBinContainer::actualContainerFormat() const void CameraBinContainer::setActualContainerFormat(const QString &containerFormat) { -#ifdef HAVE_GST_ENCODING_PROFILES +#if QT_CONFIG(gstreamer_encodingprofiles) m_actualFormat = containerFormat; #endif } @@ -105,7 +106,7 @@ void CameraBinContainer::resetActualContainerFormat() m_actualFormat = m_format; } -#ifdef HAVE_GST_ENCODING_PROFILES +#if QT_CONFIG(gstreamer_encodingprofiles) GstEncodingContainerProfile *CameraBinContainer::createProfile() { |