summaryrefslogtreecommitdiff
path: root/src/lib/ffmpeg_examiner.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_examiner.h
parent248fe9bd28d93a9e269093b4dfbec5d0ceb49ce1 (diff)
Put Time types in dcpomatic namespace.
Diffstat (limited to 'src/lib/ffmpeg_examiner.h')
-rw-r--r--src/lib/ffmpeg_examiner.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/ffmpeg_examiner.h b/src/lib/ffmpeg_examiner.h
index 67fdcfae0..d2e6e1a0a 100644
--- a/src/lib/ffmpeg_examiner.h
+++ b/src/lib/ffmpeg_examiner.h
@@ -49,7 +49,7 @@ public:
return _audio_streams;
}
- boost::optional<ContentTime> first_video () const {
+ boost::optional<dcpomatic::ContentTime> first_video () const {
return _first_video;
}
@@ -81,11 +81,11 @@ private:
std::string stream_name (AVStream* s) const;
std::string subtitle_stream_name (AVStream* s) const;
- boost::optional<ContentTime> frame_time (AVStream* s) const;
+ boost::optional<dcpomatic::ContentTime> frame_time (AVStream* s) const;
std::vector<boost::shared_ptr<FFmpegSubtitleStream> > _subtitle_streams;
std::vector<boost::shared_ptr<FFmpegAudioStream> > _audio_streams;
- boost::optional<ContentTime> _first_video;
+ boost::optional<dcpomatic::ContentTime> _first_video;
/** Video length, either obtained from the header or derived by running
* through the whole file.
*/
@@ -96,7 +96,7 @@ private:
struct SubtitleStart
{
- SubtitleStart (std::string id_, bool image_, ContentTime time_)
+ SubtitleStart (std::string id_, bool image_, dcpomatic::ContentTime time_)
: id (id_)
, image (image_)
, time (time_)
@@ -105,7 +105,7 @@ private:
std::string id;
/** true if it's an image subtitle, false for text */
bool image;
- ContentTime time;
+ dcpomatic::ContentTime time;
};
typedef std::map<boost::shared_ptr<FFmpegSubtitleStream>, boost::optional<SubtitleStart> > LastSubtitleMap;