Merge branch 'otio' of https://github.com/olive-editor/olive into otio

2020-10-22 22:13:37 +11:00
parent 917738d1de c37607bf66
commit 9613730ee8
4 changed files with 13 additions and 3 deletions
@@ -54,7 +54,9 @@
 #include "render/diskmanager.h"
 #include "render/pixelformat.h"
 #include "render/shaderinfo.h"
+#ifdef USE_OTIO
 #include "task/project/exportotio/exportotiotask.h"
+#endif
 #include "task/project/import/import.h"
 #include "task/project/import/importerrordialog.h"
 #include "task/project/load/load.h"