Merge master.

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

diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index d6cb8c24643c0aed8c1d0f63471f8af9fca1629f..9f85c2dca8e5e2d9fc66045cd694dab07c12fb90 100644 (file)
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -50,7 +50,7 @@ public:
        FFmpegDecoder (boost::shared_ptr<const FFmpegContent>, boost::shared_ptr<Log>);
 
 private:
-       friend class ::ffmpeg_pts_offset_test;
+       friend struct ::ffmpeg_pts_offset_test;
 
        void seek (ContentTime time, bool);
        bool pass ();
@@ -66,7 +66,7 @@ private:
        void maybe_add_subtitle ();
        boost::shared_ptr<AudioBuffers> deinterleave_audio (uint8_t** data, int size);
 
-       bool has_subtitle_during (ContentTimePeriod) const;
+       std::list<ContentTimePeriod> subtitles_during (ContentTimePeriod, bool starting) const;
        
        boost::shared_ptr<Log> _log;