Merge branch 'master' into otio

This commit is contained in:
itsmattkc
2020-09-25 17:00:02 +10:00
-6
View File
@@ -35,12 +35,6 @@ class OIIODecoder : public Decoder
public:
OIIODecoder();
enum ExportCodec {
kCodecEXR,
kCodecPNG,
kCodecTIFF
};
virtual QString id() override;
virtual bool Probe(Footage *f, const QAtomicInt* cancelled) override;