Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

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

diff --git a/src/lib/ffmpeg_examiner.h b/src/lib/ffmpeg_examiner.h
index 6e218512917813a5fe91ddbb7501c1b2ed3345a9..e87e11d1c7db29249e360963057a44a90c1aa647 100644 (file)
--- a/src/lib/ffmpeg_examiner.h
+++ b/src/lib/ffmpeg_examiner.h
@@ -86,6 +86,17 @@ private:
        Frame _video_length;
        bool _need_video_length;
 
-       typedef std::map<boost::shared_ptr<FFmpegSubtitleStream>, boost::optional<ContentTime> > LastSubtitleMap;
+       struct SubtitleStart
+       {
+               SubtitleStart (std::string id_, ContentTime time_)
+                       : id (id_)
+                       , time (time_)
+               {}
+
+               std::string id;
+               ContentTime time;
+       };
+
+       typedef std::map<boost::shared_ptr<FFmpegSubtitleStream>, boost::optional<SubtitleStart> > LastSubtitleMap;
        LastSubtitleMap _last_subtitle_start;
 };