diff --git a/app/codec/footagemeta.h b/app/codec/footagemeta.h deleted file mode 100644 index 4d23025f1..000000000 --- a/app/codec/footagemeta.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef FOOTAGEMETA_H -#define FOOTAGEMETA_H - -struct FootageData { - struct StreamData { - - }; -}; - -#endif // FOOTAGEMETA_H diff --git a/app/codec/oiio/oiiodecoder.cpp b/app/codec/oiio/oiiodecoder.cpp index e9a84ca28..7c7dd8878 100644 --- a/app/codec/oiio/oiiodecoder.cpp +++ b/app/codec/oiio/oiiodecoder.cpp @@ -73,7 +73,8 @@ FootageDescription OIIODecoder::Probe(const QString &filename, CancelAtom *cance bool stream_enabled = true; - for (int i=0; in->seek_subimage(i, 0); i++) { + int i; + for (i=0; in->seek_subimage(i, 0); i++) { OIIO::ImageSpec spec = in->spec(); VideoParams video_params = GetVideoParamsFromImageSpec(spec); @@ -104,6 +105,8 @@ FootageDescription OIIODecoder::Probe(const QString &filename, CancelAtom *cance desc.AddVideoStream(video_params); } + desc.SetStreamCount(i); + // If we're here, we have a successful image open in->close(); diff --git a/app/node/project/footage/footagedescription.h b/app/node/project/footage/footagedescription.h index 0c55cb044..c05849273 100644 --- a/app/node/project/footage/footagedescription.h +++ b/app/node/project/footage/footagedescription.h @@ -142,7 +142,7 @@ public: } private: - static constexpr unsigned kFootageMetaVersion = 3; + static constexpr unsigned kFootageMetaVersion = 4; QString decoder_;