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 96720b280bfc869269de92b041b83b4ba2b32d3e..e87e11d1c7db29249e360963057a44a90c1aa647 100644 (file)
--- a/src/lib/ffmpeg_examiner.h
+++ b/src/lib/ffmpeg_examiner.h
@@ -21,7 +21,7 @@
 #include "video_examiner.h"
 #include <boost/optional.hpp>
 
-class AVStream;
+struct AVStream;
 
 class FFmpegAudioStream;
 class FFmpegSubtitleStream;
@@ -35,6 +35,7 @@ public:
        dcp::Size video_size () const;
        Frame video_length () const;
        boost::optional<double> sample_aspect_ratio () const;
+       bool yuv () const;
 
        std::vector<boost::shared_ptr<FFmpegSubtitleStream> > subtitle_streams () const {
                return _subtitle_streams;
@@ -85,5 +86,17 @@ private:
        Frame _video_length;
        bool _need_video_length;
 
-       boost::optional<ContentTime> _last_subtitle_start;
+       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;
 };