X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_decoder.h;h=990d643a704d6ab5223cdb2bebc9467d736f18e6;hb=6fde557864505b470c438e4161ee494f29b90d63;hp=ce52679364f69844fc9e1d50e92612ba95a6c09d;hpb=9e025d3f85f9d6d855b3d5e6c90bca0eac3a3d49;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index ce5267936..990d643a7 100644
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -34,7 +34,7 @@ extern "C" {
 #include <stdint.h>
 
 class Log;
-class FilterGraph;
+class VideoFilterGraph;
 class FFmpegAudioStream;
 struct ffmpeg_pts_offset_test;
 
@@ -49,7 +49,7 @@ public:
 private:
 	friend struct ::ffmpeg_pts_offset_test;
 
-	bool pass (PassReason);
+	bool pass (PassReason, bool accurate);
 	void seek (ContentTime time, bool);
 	void flush ();
 
@@ -61,16 +61,17 @@ private:
 	void decode_subtitle_packet ();
 
 	void decode_bitmap_subtitle (AVSubtitleRect const * rect, ContentTimePeriod period);
+	void decode_ass_subtitle (std::string ass, ContentTimePeriod period);
 
 	void maybe_add_subtitle ();
-	boost::shared_ptr<AudioBuffers> deinterleave_audio (boost::shared_ptr<FFmpegAudioStream> stream, uint8_t** data, int size);
+	boost::shared_ptr<AudioBuffers> deinterleave_audio (boost::shared_ptr<FFmpegAudioStream> stream) const;
 
 	std::list<ContentTimePeriod> image_subtitles_during (ContentTimePeriod, bool starting) const;
 	std::list<ContentTimePeriod> text_subtitles_during (ContentTimePeriod, bool starting) const;
 
 	boost::shared_ptr<Log> _log;
 
-	std::list<boost::shared_ptr<FilterGraph> > _filter_graphs;
+	std::list<boost::shared_ptr<VideoFilterGraph> > _filter_graphs;
 	boost::mutex _filter_graphs_mutex;
 
 	ContentTime _pts_offset;