Merge branch 'master' into next

[kdenlive] / data / blacklisted_effects.txt

diff --git a/data/blacklisted_effects.txt b/data/blacklisted_effects.txt
index 4829d83513157ed5799e9b259fc6cd3fff50a607..e7510c4225f36259095e53d2cbb4a629aa1e5ffd 100644 (file)
--- a/data/blacklisted_effects.txt
+++ b/data/blacklisted_effects.txt
@@ -38,6 +38,7 @@ frei0r.facedetect
 frei0r.facebl0r
 frei0r.flippo
 frei0r.glow
+frei0r.iirblur
 frei0r.hqdn3d
 frei0r.hueshift0r
 frei0r.lenscorrection
@@ -71,8 +72,8 @@ frei0r.vectorscope
 frei0r.vertigo
 frei0r.vignette
 
-#MLT effects with XML UI
 
+#MLT effects with XML UI
 dust
 grain
 lines
@@ -81,12 +82,24 @@ tcolor
 rotoscoping
 wave
 volume
-
-#effects that have simplekeyframes
 vignette
 
-#Effects not usable with a simple GUI
 
+#Effects not usable with a simple GUI
 sox
 ladspa
 jackrack
+luma
+data_show
+gtkrescale
+watermark
+region
+resize
+resample
+mono
+
+dynamictext
+
+# Effects need extra GUI to create the resulting melt.xml with the corrected content
+videostab
+videostab2