X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_decoder.h;h=15fe5d9a48966cbb42d6ec66e9a676f46646757a;hb=e6f28e7cda23c1ba3c49cc1bf2dc1491c2f87160;hp=ee725b20c9c46cb066d9e98bbfd6d7331bee45c9;hpb=58588c485eac7c488a574fe923576f109ec0134e;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index ee725b20c..15fe5d9a4 100644
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -29,7 +29,6 @@
 #include <boost/thread/mutex.hpp>
 extern "C" {
 #include <libavcodec/avcodec.h>
-#include <libpostproc/postprocess.h>
 }
 #include "util.h"
 #include "decoder.h"
@@ -38,7 +37,7 @@ extern "C" {
 #include "subtitle_decoder.h"
 #include "ffmpeg.h"
 
-class Film;
+class Log;
 class FilterGraph;
 class ffmpeg_pts_offset_test;
 
@@ -48,7 +47,7 @@ class ffmpeg_pts_offset_test;
 class FFmpegDecoder : public VideoDecoder, public AudioDecoder, public SubtitleDecoder, public FFmpeg
 {
 public:
-	FFmpegDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<const FFmpegContent>, bool video, bool audio);
+	FFmpegDecoder (boost::shared_ptr<const FFmpegContent>, boost::shared_ptr<Log>, bool video, bool audio, bool subtitles);
 	~FFmpegDecoder ();
 
 	void seek (ContentTime time, bool);
@@ -74,8 +73,9 @@ private:
 	bool seek_overrun_finished (ContentTime, boost::optional<ContentTime>, boost::optional<ContentTime>) const;
 	bool seek_final_finished (int, int) const;
 	int minimal_run (boost::function<bool (boost::optional<ContentTime>, boost::optional<ContentTime>, int)>);
-	void seek_and_flush (int64_t);
+	void seek_and_flush (ContentTime);
 
+	boost::shared_ptr<Log> _log;
 	AVCodecContext* _subtitle_codec_context; ///< may be 0 if there is no subtitle
 	AVCodec* _subtitle_codec;		 ///< may be 0 if there is no subtitle
 	
@@ -84,6 +84,7 @@ private:
 
 	bool _decode_video;
 	bool _decode_audio;
+	bool _decode_subtitles;
 
-	double _pts_offset;
+	ContentTime _pts_offset;
 };