Merge branch 'master' into next

[kdenlive] / data / blacklisted_effects.txt

diff --git a/data/blacklisted_effects.txt b/data/blacklisted_effects.txt
index c91364e33b066ebf058dfd2b634818a596dc6f32..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
@@ -98,3 +99,7 @@ resample
 mono
 
 dynamictext
+
+# Effects need extra GUI to create the resulting melt.xml with the corrected content
+videostab
+videostab2