Merge branch 'master' into 2.0

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

diff --git a/src/lib/ffmpeg_examiner.h b/src/lib/ffmpeg_examiner.h
index 4912d899a85f7a70015fa83c72fe61743cb6aab2..2dd8b2e34baabc95594f4b21c79b92fae7eb679f 100644 (file)
--- a/src/lib/ffmpeg_examiner.h
+++ b/src/lib/ffmpeg_examiner.h
@@ -31,7 +31,7 @@ public:
        
        float video_frame_rate () const;
        libdcp::Size video_size () const;
-       VideoContent::Frame video_length () const;
+       VideoFrame video_length () const;
 
        std::vector<boost::shared_ptr<FFmpegSubtitleStream> > subtitle_streams () const {
                return _subtitle_streams;
@@ -47,6 +47,8 @@ public:
        
 private:
        std::string stream_name (AVStream* s) const;
+       std::string audio_stream_name (AVStream* s) const;
+       std::string subtitle_stream_name (AVStream* s) const;
        boost::optional<double> frame_time (int) const;
        
        std::vector<boost::shared_ptr<FFmpegSubtitleStream> > _subtitle_streams;