Merge branch 'master' into pr/1875

2022-04-15 13:24:23 -07:00
parent 6464bdfd68 95aa3249d0
commit 97a210f14b
268 changed files with 73441 additions and 2576 deletions
@@ -48,8 +48,9 @@ public:
    kSolidGenerator,
    kMerge,
    kStrokeFilter,
-    kTextGeneratorLegacy,
-    kTextGenerator,
+    kTextGeneratorV1,
+    kTextGeneratorV2,
+    kTextGeneratorV3,
    kCrossDissolveTransition,
    kDipToColorTransition,
    kMosaicFilter,
@@ -61,6 +62,8 @@ public:
    kTimeRemapNode,
    kSubtitleBlock,
    kShapeGenerator,
+    kColorDifferenceKeyKeying,
+    kDespillKeying,
    kGroupNode,
    kOpacityEffect,
    kFlipDistort,