X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_decoder.h;h=6f027ce1c1ba2687df7d774aa22207883f373a27;hb=661de111c0dbc968ecb004eca5b26f8400b136f1;hp=b5bcdd35800fbaa07a0556ce00c082f8e4964e91;hpb=2bfd531137f1a4874493186015046e33c5a07c1e;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index b5bcdd358..6f027ce1c 100644
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -53,8 +53,8 @@ public:
 private:
 	friend struct ::ffmpeg_pts_offset_test;
 
+	bool pass (PassReason reason);
 	void seek (ContentTime time, bool);
-	bool pass ();
 	void flush ();
 
 	AVSampleFormat audio_sample_format () const;
@@ -64,13 +64,11 @@ private:
 	void decode_audio_packet ();
 	void decode_subtitle_packet ();
 
+	void decode_bitmap_subtitle (AVSubtitleRect const * rect, ContentTimePeriod period);
+
 	void maybe_add_subtitle ();
 	boost::shared_ptr<AudioBuffers> deinterleave_audio (uint8_t** data, int size);
 
-	boost::optional<ContentTime> _pending_subtitle_from;
-	boost::shared_ptr<Image> _pending_subtitle_image;
-	boost::optional<dcpomatic::Rect<double> > _pending_subtitle_rect;
-
 	std::list<ContentTimePeriod> image_subtitles_during (ContentTimePeriod, bool starting) const;
 	std::list<ContentTimePeriod> text_subtitles_during (ContentTimePeriod, bool starting) const;