X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_examiner.h;h=4de475d2a3f78d753985f6b165e56bf3b74c7290;hb=c33e0fb07be8ffeeff4581aa07621aebd84c638a;hp=875451507a33d51833c9637784f63684b22fd0df;hpb=f1bf21a9c2581591ab80bfc997a22b93046f8c56;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_examiner.h b/src/lib/ffmpeg_examiner.h
index 875451507..4de475d2a 100644
--- a/src/lib/ffmpeg_examiner.h
+++ b/src/lib/ffmpeg_examiner.h
@@ -17,6 +17,7 @@
 
 */
 
+#include <boost/optional.hpp>
 #include "ffmpeg.h"
 #include "video_examiner.h"
 
@@ -30,7 +31,7 @@ public:
 	
 	float video_frame_rate () const;
 	libdcp::Size video_size () const;
-	ContentVideoFrame video_length () const;
+	VideoContent::Frame video_length () const;
 
 	std::vector<boost::shared_ptr<FFmpegSubtitleStream> > subtitle_streams () const {
 		return _subtitle_streams;
@@ -40,9 +41,17 @@ public:
 		return _audio_streams;
 	}
 
+	boost::optional<double> first_video () const {
+		return _first_video;
+	}
+	
 private:
 	std::string stream_name (AVStream* s) const;
+	std::string audio_stream_name (AVStream* s) const;
+	std::string subtitle_stream_name (AVStream* s) const;
+	boost::optional<double> frame_time (int) const;
 	
-        std::vector<boost::shared_ptr<FFmpegSubtitleStream> > _subtitle_streams;
-        std::vector<boost::shared_ptr<FFmpegAudioStream> > _audio_streams;
+	std::vector<boost::shared_ptr<FFmpegSubtitleStream> > _subtitle_streams;
+	std::vector<boost::shared_ptr<FFmpegAudioStream> > _audio_streams;
+	boost::optional<double> _first_video;
 };