X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_decoder.h;h=6006fc08d521b2595d418fbb24138e03e6485ebc;hb=04533b9cf34ce8089113015715083ee9c5b2b001;hp=fbf802bb01004cf9c7d3f27f12e65a0f962af888;hpb=a4c19a34244aeaf183c25878933b570fc5c0ee34;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index fbf802bb0..6006fc08d 100644
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -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"
@@ -48,19 +47,16 @@ class 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>, bool video, bool audio, bool subtitles);
+	FFmpegDecoder (boost::shared_ptr<const FFmpegContent>, boost::shared_ptr<Log>);
 	~FFmpegDecoder ();
 
-	void seek (ContentTime time, bool);
-
 private:
 	friend class ::ffmpeg_pts_offset_test;
 
+	void seek (ContentTime time, bool);
 	bool pass ();
 	void flush ();
 
-	void setup_subtitle ();
-
 	AVSampleFormat audio_sample_format () const;
 	int bytes_per_audio_sample () const;
 
@@ -83,9 +79,5 @@ private:
 	std::list<boost::shared_ptr<FilterGraph> > _filter_graphs;
 	boost::mutex _filter_graphs_mutex;
 
-	bool _decode_video;
-	bool _decode_audio;
-	bool _decode_subtitles;
-
 	ContentTime _pts_offset;
 };