diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-10-27 05:40:34 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-10-27 05:43:09 +0200 |
| commit | 732d9cb6848a42f5a61b2b74dece962cdfba1d31 (patch) | |
| tree | ccbc4894addfbdd10ec02bae3b30b238e0455785 /src/plugins/gstreamer | |
| parent | fa8e1e71bb17efe2549d9e81768f19c065065fce (diff) | |
| parent | 08db8a408829cb3bbd204e71dd8d5616e7d21d3d (diff) | |
| download | qtmultimedia-732d9cb6848a42f5a61b2b74dece962cdfba1d31.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
.qmake.conf
examples/multimedia/declarative-radio/view.qml
src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.h
Change-Id: I97b507878b6de04ec38ddd13530e58b8f72390e4
Diffstat (limited to 'src/plugins/gstreamer')
| -rw-r--r-- | src/plugins/gstreamer/camerabin/camerabinimagecapture.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/gstreamer/camerabin/camerabinimagecapture.cpp b/src/plugins/gstreamer/camerabin/camerabinimagecapture.cpp index df73b9d2c..29d7743ed 100644 --- a/src/plugins/gstreamer/camerabin/camerabinimagecapture.cpp +++ b/src/plugins/gstreamer/camerabin/camerabinimagecapture.cpp @@ -305,7 +305,9 @@ bool CameraBinImageCapture::processBusMessage(const QGstreamerMessage &message) if (!element) return false; - QString elementName = QString::fromLatin1(gst_element_get_name(element)); + gchar *name = gst_element_get_name(element); + QString elementName = QString::fromLatin1(name); + g_free(name); #if !GST_CHECK_VERSION(1,0,0) GstElementClass *elementClass = GST_ELEMENT_GET_CLASS(element); QString elementLongName = elementClass->details.longname; |