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

Change-Id: I0bc0e3caceaca0def467237983d9c611c46c5d7a

2 files changed, 7 insertions, 3 deletions

diff --git a/src/plugins/android/src/qandroidmediaserviceplugin.cpp b/src/plugins/android/src/qandroidmediaserviceplugin.cpp
index f441baf0a..a66b85f98 100644
--- a/src/plugins/android/src/qandroidmediaserviceplugin.cpp
+++ b/src/plugins/android/src/qandroidmediaserviceplugin.cpp
@@ -166,7 +166,7 @@ Q_DECL_EXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void * /*reserved*/)
     UnionJNIEnvToVoid uenv;
     uenv.venv = NULL;
 
-    if (vm->GetEnv(&uenv.venv, JNI_VERSION_1_4) != JNI_OK)
+    if (vm->GetEnv(&uenv.venv, JNI_VERSION_1_6) != JNI_OK)
         return JNI_ERR;
 
     JNIEnv *jniEnv = uenv.nativeEnvironment;
@@ -180,5 +180,5 @@ Q_DECL_EXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void * /*reserved*/)
 
     AndroidSurfaceTexture::initJNI(jniEnv);
 
-    return JNI_VERSION_1_4;
+    return JNI_VERSION_1_6;
 }
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());
     }