X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg.h;h=10517055c26cf842619699a901bc561ff00a8fde;hb=f10e025eba54b0ab4dbe1b3611071b160ca89208;hp=95a8bf5d9aa1bb7f860d1365b69bfc7fc550b058;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05;p=dcpomatic.git

diff --git a/src/lib/ffmpeg.h b/src/lib/ffmpeg.h
index 95a8bf5d9..10517055c 100644
--- a/src/lib/ffmpeg.h
+++ b/src/lib/ffmpeg.h
@@ -40,7 +40,7 @@ class Log;
 class FFmpeg
 {
 public:
-	FFmpeg (boost::shared_ptr<const FFmpegContent>);
+	explicit FFmpeg (boost::shared_ptr<const FFmpegContent>);
 	virtual ~FFmpeg ();
 
 	boost::shared_ptr<const FFmpegContent> ffmpeg_content () const {
@@ -53,13 +53,11 @@ public:
 protected:
 	AVCodecContext* video_codec_context () const;
 	AVCodecContext* subtitle_codec_context () const;
-	ContentTime pts_offset (
-		std::vector<boost::shared_ptr<FFmpegAudioStream> > audio_streams, boost::optional<ContentTime> first_video, double video_frame_rate
+	dcpomatic::ContentTime pts_offset (
+		std::vector<boost::shared_ptr<FFmpegAudioStream> > audio_streams, boost::optional<dcpomatic::ContentTime> first_video, double video_frame_rate
 		) 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;