X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg.h;h=10517055c26cf842619699a901bc561ff00a8fde;hb=5d92e7bf242200c3b3b8a079671b572569d2b198;hp=dab67ead9fec3369b5c90379dcbd6516df1cef9c;hpb=c6871fe8617b3de03662b7630355059393bf8043;p=dcpomatic.git diff --git a/src/lib/ffmpeg.h b/src/lib/ffmpeg.h index dab67ead9..10517055c 100644 --- a/src/lib/ffmpeg.h +++ b/src/lib/ffmpeg.h @@ -53,13 +53,11 @@ public: protected: AVCodecContext* video_codec_context () const; AVCodecContext* subtitle_codec_context () const; - ContentTime pts_offset ( - std::vector > audio_streams, boost::optional first_video, double video_frame_rate + dcpomatic::ContentTime pts_offset ( + std::vector > audio_streams, boost::optional 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 _ffmpeg_content;