summaryrefslogtreecommitdiffstats
path: root/src/plugins/gstreamer
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2017-10-27 07:15:28 +0200
committerLiang Qi <liang.qi@qt.io>2017-10-27 07:15:35 +0200
commit1cb4027e0a59e1875db88b72afb5833aafbd87eb (patch)
tree35646da4972db8bff385ec4147161d133e7bf1b8 /src/plugins/gstreamer
parent82694e41b1d37e04ecc911f420ad4317220f8180 (diff)
parent732d9cb6848a42f5a61b2b74dece962cdfba1d31 (diff)
Merge remote-tracking branch 'origin/5.10' into dev
Diffstat (limited to 'src/plugins/gstreamer')
-rw-r--r--src/plugins/gstreamer/camerabin/camerabinimagecapture.cpp4
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;