Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

[dcpomatic.git] / src / lib / ffmpeg_decoder.h

diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index 60217b07372f3c2da65bc225462cec03deb493e7..ce52679364f69844fc9e1d50e92612ba95a6c09d 100644 (file)
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -22,21 +22,16 @@
  */
 
 #include "util.h"
-#include "decoder.h"
 #include "video_decoder.h"
 #include "audio_decoder.h"
 #include "subtitle_decoder.h"
 #include "ffmpeg.h"
-#include "rect.h"
 extern "C" {
 #include <libavcodec/avcodec.h>
 }
 #include <boost/shared_ptr.hpp>
-#include <boost/optional.hpp>
 #include <boost/thread/mutex.hpp>
 #include <stdint.h>
-#include <vector>
-#include <string>
 
 class Log;
 class FilterGraph;
@@ -49,12 +44,12 @@ struct ffmpeg_pts_offset_test;
 class FFmpegDecoder : public VideoDecoder, public AudioDecoder, public SubtitleDecoder, public FFmpeg
 {
 public:
-       FFmpegDecoder (boost::shared_ptr<const FFmpegContent>, boost::shared_ptr<Log>);
+       FFmpegDecoder (boost::shared_ptr<const FFmpegContent>, boost::shared_ptr<Log>, bool fast);
 
 private:
        friend struct ::ffmpeg_pts_offset_test;
 
-       bool pass ();
+       bool pass (PassReason);
        void seek (ContentTime time, bool);
        void flush ();