Merge branch 'master' into pr/1987

app/codec/decoder.cpp

@@ -43,6 +43,12 @@ Decoder::Decoder() :
   UpdateLastAccessed();
 }
 
+void Decoder::IncrementAccessTime(qint64 t)
+{
+  QMutexLocker locker(&mutex_);
+  last_accessed_ += t;
+}
+
 bool Decoder::Open(const CodecStream &stream)
 {
   QMutexLocker locker(&mutex_);

app/codec/decoder.h

@@ -87,6 +87,8 @@ public:
   virtual bool SupportsVideo(){return false;}
   virtual bool SupportsAudio(){return false;}
 
+  void IncrementAccessTime(qint64 t);
+
   class CodecStream
   {
   public:

app/codec/ffmpeg/ffmpegdecoder.cpp

@@ -513,6 +513,8 @@ FootageDescription FFmpegDecoder::Probe(const QString &filename, CancelAtom *can
 
     }
 
+    desc.SetStreamCount(fmt_ctx->nb_streams);
+
   }
 
   // Free all memory

app/codec/footagemeta.h

@@ -1,10 +0,0 @@
-#ifndef FOOTAGEMETA_H
-#define FOOTAGEMETA_H
-
-struct FootageData {
-  struct StreamData {
-
-  };
-};
-
-#endif // FOOTAGEMETA_H

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();