Merge branch 'refs/heads/v0.8.2'

[kdenlive] / src / wizard.cpp

diff --git a/src/wizard.cpp b/src/wizard.cpp
index 28d7aa98e38fe682d7707290e277b0c027d769fb..7574901ae0fd37bd1707fd2f5009223f77ac00ba 100644 (file)
--- a/src/wizard.cpp
+++ b/src/wizard.cpp
@@ -44,7 +44,7 @@
 // Recommended MLT version
 const int mltVersionMajor = 0;
 const int mltVersionMinor = 7;
-const int mltVersionRevision = 4;
+const int mltVersionRevision = 6;
 
 static const char kdenlive_version[] = VERSION;
 
@@ -219,7 +219,9 @@ void Wizard::slotUpdateCaptureParameters()
             itemSize = sizes.at(j).section("=", 0, 0);
             itemRates = sizes.at(j).section("=", 1, 1).split(",", QString::SkipEmptyParts);
             for (int k = 0; k < itemRates.count(); k++) {
-                m_capture.v4l_formats->addItem("[" + format + "] " + itemSize + " (" + itemRates.at(k) + ")", QStringList() << format << itemSize.section('x', 0, 0) << itemSize.section('x', 1, 1) << itemRates.at(k).section('/', 0, 0) << itemRates.at(k).section('/', 1, 1));
+                QString formatDescription = "[" + format + "] " + itemSize + " (" + itemRates.at(k) + ")";
+                if (m_capture.v4l_formats->findText(formatDescription) == -1)
+                    m_capture.v4l_formats->addItem(formatDescription, QStringList() << format << itemSize.section('x', 0, 0) << itemSize.section('x', 1, 1) << itemRates.at(k).section('/', 0, 0) << itemRates.at(k).section('/', 1, 1));
             }
         }
     }