Merge branch 'master' of git://anongit.kde.org/kdenlive

[kdenlive] / src / v4l / v4lcapture.cpp

diff --git a/src/v4l/v4lcapture.cpp b/src/v4l/v4lcapture.cpp
index 530fe8143eae704540a38eea25237b8009852442..752a6b13196ea744379c9a720ae85c23b7bd4baf 100644 (file)
--- a/src/v4l/v4lcapture.cpp
+++ b/src/v4l/v4lcapture.cpp
@@ -63,10 +63,12 @@ QStringList V4lCaptureHandler::getDeviceName(QString input)
     v4lsrc.source     = strdup(input.toUtf8().constData());
     char *pixelformatdescription;
     pixelformatdescription = (char *) calloc(2048, sizeof(char));
-    QString deviceName(query_v4ldevice(&v4lsrc, &pixelformatdescription));
+    QStringList result;
+    const char *devName = query_v4ldevice(&v4lsrc, &pixelformatdescription);
+    if (devName == NULL) return result; 
+    QString deviceName(devName);
     QString info(pixelformatdescription);
     free (pixelformatdescription);
-    QStringList result;
     result << (deviceName.isEmpty() ? input : deviceName) << info;
     return result;
 }