Merge branch 'master' into next

[kdenlive] / data / blacklisted_effects.txt

diff --git a/data/blacklisted_effects.txt b/data/blacklisted_effects.txt
index cf718c655c7996709927f41f335460cdfa28aeb8..e7510c4225f36259095e53d2cbb4a629aa1e5ffd 100644 (file)
--- a/data/blacklisted_effects.txt
+++ b/data/blacklisted_effects.txt
@@ -34,8 +34,11 @@ frei0r.d90stairsteppingfix
 frei0r.distort0r
 frei0r.edgeglow
 frei0r.equaliz0r
+frei0r.facedetect
+frei0r.facebl0r
 frei0r.flippo
 frei0r.glow
+frei0r.iirblur
 frei0r.hqdn3d
 frei0r.hueshift0r
 frei0r.lenscorrection
@@ -67,9 +70,10 @@ frei0r.tint0r
 frei0r.twolay0r
 frei0r.vectorscope
 frei0r.vertigo
+frei0r.vignette
 
-#MLT effects with XML UI
 
+#MLT effects with XML UI
 dust
 grain
 lines
@@ -77,6 +81,25 @@ oldfilm
 tcolor
 rotoscoping
 wave
-
-#effects that have simplekeyframes
+volume
 vignette
+
+
+#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