Fix building without OTIO support

Added a new CMake flag that stops any OTIO related cpp files being
built.

Added extra #ifdefs to catch any OTIO related code in other cpp
files.
This commit is contained in:
Thomas Wilshaw
2020-10-15 18:59:06 +01:00
parent 33b479b393
commit 70455c1501
4 changed files with 13 additions and 3 deletions
+4 -1
View File
@@ -27,7 +27,9 @@
#include "codec/ffmpeg/ffmpegcommon.h"
#include "codec/ffmpeg/ffmpegdecoder.h"
#include "codec/oiio/oiiodecoder.h"
#ifdef USE_OTIO
#include "codec/otio/otiodecoder.h"
#endif
#include "codec/waveinput.h"
#include "codec/waveoutput.h"
#include "common/filefunctions.h"
@@ -90,8 +92,9 @@ QVector<DecoderPtr> ReceiveListOfAllDecoders() {
// The order in which these decoders are added is their priority when probing. Hence FFmpeg should usually be last,
// since it supports so many formats and we presumably want to override those formats with a more specific decoder.
#ifdef USE_OTIO
decoders.append(std::make_shared<OTIODecoder>());
#endif
decoders.append(std::make_shared<OIIODecoder>());
decoders.append(std::make_shared<FFmpegDecoder>());