Merge remote-tracking branch 'origin/5.14' into 5.15

Change-Id: I0bc0e3caceaca0def467237983d9c611c46c5d7a

1 files changed, 5 insertions, 1 deletions

diff --git a/src/plugins/gstreamer/camerabin/camerabincontainer.cpp b/src/plugins/gstreamer/camerabin/camerabincontainer.cpp
index 0fc51611e..1d28e1a6e 100644
--- a/src/plugins/gstreamer/camerabin/camerabincontainer.cpp
+++ b/src/plugins/gstreamer/camerabin/camerabincontainer.cpp
@@ -110,7 +110,7 @@ void CameraBinContainer::resetActualContainerFormat()
 
 GstEncodingContainerProfile *CameraBinContainer::createProfile()
 {
-    GstCaps *caps;
+    GstCaps *caps = nullptr;
 
     if (m_actualFormat.isEmpty()) {
         return 0;
@@ -121,6 +121,7 @@ GstEncodingContainerProfile *CameraBinContainer::createProfile()
         //if format is not in the list of supported gstreamer mime types,
         //try to find the mime type with matching extension
         if (!supportedFormats.contains(format)) {
+            format.clear();
             QString extension = QGstUtils::fileExtensionForMimeType(m_actualFormat);
             for (const QString &formatCandidate : supportedFormats) {
                 if (QGstUtils::fileExtensionForMimeType(formatCandidate) == extension) {
@@ -130,6 +131,9 @@ GstEncodingContainerProfile *CameraBinContainer::createProfile()
             }
         }
 
+        if (format.isEmpty())
+            return nullptr;
+
         caps = gst_caps_from_string(format.toLatin1());
     }