Fix seconds_to_approximate_hms sometimes saying things like 1h60m (#1314).

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

diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index bd7ba98b84fe0f74edd8e50ca195a9873de2ba4b..3a38f4475333d3f3871e057fb376c56ff3ca2122 100644 (file)
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -36,6 +36,7 @@ class Log;
 class VideoFilterGraph;
 class FFmpegAudioStream;
 class AudioBuffers;
+class Image;
 struct ffmpeg_pts_offset_test;
 
 /** @class FFmpegDecoder
@@ -44,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,4 +76,8 @@ private:
        ContentTime _pts_offset;
        boost::optional<ContentTime> _current_subtitle_to;
        bool _have_current_subtitle;
+
+       boost::shared_ptr<Image> _black_image;
+
+       std::vector<boost::optional<ContentTime> > _next_time;
 };