finished merge of viewer and footage

app/codec/decoder.h

@@ -37,7 +37,6 @@ extern "C" {
 #include "common/rational.h"
 #include "project/item/footage/footage.h"
 #include "project/item/footage/footagedescription.h"
-#include "project/item/footage/stream.h"
 
 namespace olive {
 

app/codec/ffmpeg/ffmpegdecoder.cpp

@@ -100,7 +100,7 @@ bool FFmpegDecoder::OpenInternal()
   int64_t ts;
 
   // If it's an image sequence, we'll probably need to transform the filename
-  if (stream().GetStream().video_type() == Stream::kVideoTypeImageSequence) {
+  if (stream().GetStream().video_type() == Track::kVideoTypeImageSequence) {
     ts = stream().GetTimeInTimebaseUnits(timecode);
 
     img_filename = TransformImageSequenceFileName(stream().filename(), ts);