Token effort toward non-bitmap subtitles from FFmpegDecoder.

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

diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index 0a0eea18a7380ee9423d5b0b8076908a65654e4b..6f027ce1c1ba2687df7d774aa22207883f373a27 100644 (file)
--- 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,6 +64,8 @@ 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);