Change MagickImageProxy to FFmpegImageProxy and make it use FFmpeg

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

diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index 3ea5f580928773c1a8f681aa782e1e4e61e08def..16a55d5589139d56c3555b2c3a3f7b1f11a8760d 100644 (file)
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -45,7 +45,7 @@ struct ffmpeg_pts_offset_test;
 class FFmpegDecoder : public FFmpeg, public Decoder
 {
 public:
-       FFmpegDecoder (boost::shared_ptr<const FFmpegContent>, boost::shared_ptr<Log>);
+       FFmpegDecoder (boost::shared_ptr<const FFmpegContent>, boost::shared_ptr<Log> log, bool fast);
 
        bool pass ();
        void seek (ContentTime time, bool);
@@ -75,7 +75,10 @@ private:
 
        ContentTime _pts_offset;
        boost::optional<ContentTime> _current_subtitle_to;
+       /** true if we have a subtitle which has not had emit_stop called for it yet */
        bool _have_current_subtitle;
 
        boost::shared_ptr<Image> _black_image;
+
+       std::vector<boost::optional<ContentTime> > _next_time;
 };