C++11 tidying.

[dcpomatic.git] / src / lib / ffmpeg_audio_stream.h

diff --git a/src/lib/ffmpeg_audio_stream.h b/src/lib/ffmpeg_audio_stream.h
index a754ec5748440d00d7fc38b57bbe49683d946077..a5ed90c972e46f0a6297ff31eb17810bd8026fa3 100644 (file)
--- a/src/lib/ffmpeg_audio_stream.h
+++ b/src/lib/ffmpeg_audio_stream.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,12 +18,15 @@
 
 */
 
-#include "ffmpeg_stream.h"
+
 #include "audio_stream.h"
 #include "dcpomatic_time.h"
+#include "ffmpeg_stream.h"
+
 
 struct ffmpeg_pts_offset_test;
 
+
 class FFmpegAudioStream : public FFmpegStream, public AudioStream
 {
 public:
@@ -49,7 +52,7 @@ public:
 
        /* XXX: should probably be locked */
 
-       boost::optional<ContentTime> first_audio;
+       boost::optional<dcpomatic::ContentTime> first_audio;
        boost::optional<std::string> codec_name;
 
 private:
@@ -61,3 +64,4 @@ private:
                , AudioStream (0, 0, 0)
        {}
 };
+