Merge branch 'master' into hashremoval

2022-05-16 09:12:49 -07:00
parent d24696ff80 7ab3350c59
commit bfd6a407a5
969 changed files with 4837 additions and 2393 deletions
@@ -1,7 +1,7 @@
 /***

  Olive - Non-Linear Video Editor
-  Copyright (C) 2021 Olive Team
+  Copyright (C) 2022 Olive Team

  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -178,6 +178,13 @@ public:
     */
    kAudioParams,

+    /**
+     * Subtitle Parameters type
+     *
+     * Resolves to `SubtitleParams`
+     */
+    kSubtitleParams,
+
    /**
     * End of list
     */