diff options
| author | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2015-10-16 14:15:23 +0200 |
|---|---|---|
| committer | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2015-10-20 08:32:36 +0000 |
| commit | 3d3d2a4967ba079a3e6df82cdc89f839865e6649 (patch) | |
| tree | 360305944a20b4637fde5f96ac77fed5be3e2aa6 /src/plugins/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.cpp | |
| parent | 0cf41ef53f7b336509ed7d1ae6518655276af70f (diff) | |
GStreamer: fix compilation with version < 0.10.31.
Qt 5.4 and earlier required GStreamer 0.10.24 as minimum version.
Qt 5.5 added code that requires 0.10.31, this code is now ifdef'd
and we now support again 0.10.24.
Task-number: QTBUG-48353
Change-Id: Ie708a33c0515874b003ce26a3400475075d316ca
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
Diffstat (limited to 'src/plugins/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.cpp')
| -rw-r--r-- | src/plugins/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/plugins/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.cpp b/src/plugins/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.cpp index 0018209c2..fca38ecf8 100644 --- a/src/plugins/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.cpp +++ b/src/plugins/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.cpp @@ -77,9 +77,7 @@ static const QGstreamerMetaDataKeyLookup *qt_gstreamerMetaDataKeys() metadataKeys->insert(QMediaMetaData::AlbumTitle, GST_TAG_ALBUM); metadataKeys->insert(QMediaMetaData::AlbumArtist, GST_TAG_ARTIST); metadataKeys->insert(QMediaMetaData::ContributingArtist, GST_TAG_PERFORMER); -#if (GST_VERSION_MAJOR >= 0) && (GST_VERSION_MINOR >= 10) && (GST_VERSION_MICRO >= 19) metadataKeys->insert(QMediaMetaData::Composer, GST_TAG_COMPOSER); -#endif //metadataKeys->insert(QMediaMetaData::Conductor, 0); //metadataKeys->insert(QMediaMetaData::Lyrics, 0); //metadataKeys->insert(QMediaMetaData::Mood, 0); |