X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg.h;h=d38fd63626359a09c41b79c97d3d39927e2a2bf2;hb=a3073b3059e8df6304d2936ab2c605e6908a7373;hp=b3bc13e5cc222b9033472bfb43df8f3b70693fd7;hpb=267e21bfb78593bcb87eb24ce01b88d0859566f7;p=dcpomatic.git

diff --git a/src/lib/ffmpeg.h b/src/lib/ffmpeg.h
index b3bc13e5c..d38fd6362 100644
--- a/src/lib/ffmpeg.h
+++ b/src/lib/ffmpeg.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -56,7 +56,9 @@ protected:
 		std::vector<boost::shared_ptr<FFmpegAudioStream> > audio_streams, boost::optional<ContentTime> first_video, double video_frame_rate
 		) const;
 
-	static FFmpegSubtitlePeriod subtitle_period (AVSubtitle const &);
+	static FFmpegSubtitlePeriod subtitle_period (AVSubtitle const & sub);
+	static std::string subtitle_id (AVSubtitle const & sub);
+	static bool subtitle_starts_image (AVSubtitle const & sub);
 
 	boost::shared_ptr<const FFmpegContent> _ffmpeg_content;
 
@@ -70,7 +72,7 @@ protected:
 	AVFrame* _frame;
 
 	/** Index of video stream within AVFormatContext */
-	int _video_stream;
+	boost::optional<int> _video_stream;
 
 	/* It would appear (though not completely verified) that one must have
 	   a mutex around calls to avcodec_open* and avcodec_close... and here