itsmattkc cb5d776dab Merge pull request #1562 from ThomasWilshaw/otio_merge_fixes ...

Fixes for OTIO merges

2021-08-24 19:26:35 -07:00

..

conform

renderer: move conform to task

2021-05-14 12:20:53 +10:00

export

export: use viewer params not export params

2021-08-14 11:19:54 -07:00

precache

export: use viewer params not export params

2021-08-14 11:19:54 -07:00

project

Merge pull request #1562 from ThomasWilshaw/otio_merge_fixes

2021-08-24 19:26:35 -07:00

render

export: use viewer params not export params

2021-08-14 11:19:54 -07:00

CMakeLists.txt

updated copyright year for 2021 [skip ci]

2021-04-17 18:56:50 +10:00

task.h

renderer: move conform to task

2021-05-14 12:20:53 +10:00

taskmanager.cpp

updated copyright year for 2021 [skip ci]

2021-04-17 18:56:50 +10:00

taskmanager.h

updated copyright year for 2021 [skip ci]

2021-04-17 18:56:50 +10:00