summaryrefslogtreecommitdiff
path: root/src/lib/ffmpeg.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2019-05-08 23:41:42 +0100
committerCarl Hetherington <cth@carlh.net>2019-05-10 23:43:55 +0100
commitc4403784febdbdd42e9c32e67fadb147f11fe566 (patch)
treea3c76832e341eedcaed2152c2ebf4dd76325b6b2 /src/lib/ffmpeg.h
parent248fe9bd28d93a9e269093b4dfbec5d0ceb49ce1 (diff)
Put Time types in dcpomatic namespace.
Diffstat (limited to 'src/lib/ffmpeg.h')
-rw-r--r--src/lib/ffmpeg.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/ffmpeg.h b/src/lib/ffmpeg.h
index d2f797658..10517055c 100644
--- a/src/lib/ffmpeg.h
+++ b/src/lib/ffmpeg.h
@@ -53,8 +53,8 @@ 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);