No-op: remove all trailing whitespace.

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

diff --git a/src/lib/ffmpeg_examiner.h b/src/lib/ffmpeg_examiner.h
index 34d4b1e0d341304f4f9ff903f7debcc958421a40..7b64b508aff864661aa56b8cea8cd392a9f64c05 100644 (file)
--- a/src/lib/ffmpeg_examiner.h
+++ b/src/lib/ffmpeg_examiner.h
@@ -28,16 +28,16 @@ class FFmpegExaminer : public FFmpeg, public VideoExaminer
 {
 public:
        FFmpegExaminer (boost::shared_ptr<const FFmpegContent>, boost::shared_ptr<Job> job = boost::shared_ptr<Job> ());
-       
+
        boost::optional<float> video_frame_rate () const;
        dcp::Size video_size () const;
-       ContentTime video_length () const;
+       Frame video_length () const;
        boost::optional<float> sample_aspect_ratio () const;
 
        std::vector<boost::shared_ptr<FFmpegSubtitleStream> > subtitle_streams () const {
                return _subtitle_streams;
        }
-       
+
        std::vector<boost::shared_ptr<FFmpegAudioStream> > audio_streams () const {
                return _audio_streams;
        }
@@ -45,12 +45,12 @@ public:
        boost::optional<ContentTime> first_video () const {
                return _first_video;
        }
-       
+
 private:
        void video_packet (AVCodecContext *);
        void audio_packet (AVCodecContext *, boost::shared_ptr<FFmpegAudioStream>);
        void subtitle_packet (AVCodecContext *, boost::shared_ptr<FFmpegSubtitleStream>);
-       
+
        std::string stream_name (AVStream* s) const;
        std::string audio_stream_name (AVStream* s) const;
        std::string subtitle_stream_name (AVStream* s) const;
@@ -62,7 +62,7 @@ private:
        /** Video length, either obtained from the header or derived by running
         *  through the whole file.
         */
-       ContentTime _video_length;
+       Frame _video_length;
        bool _need_video_length;
 
        boost::optional<ContentTime> _last_subtitle_start;