Merge master.

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

diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h
index 1a30fb60693db7683c18efc00b47a642848f1019..367c30103e77812927878d0f2f31062e995cc647 100644 (file)
--- a/src/lib/ffmpeg_content.h
+++ b/src/lib/ffmpeg_content.h
@@ -73,9 +73,6 @@ public:
        void set_audio_mapping (AudioMapping);
        boost::filesystem::path audio_analysis_path () const;
 
-       /* SubtitleContent */
-       bool has_subtitle_during (ContentTimePeriod) const;
-
        void set_filters (std::vector<Filter const *> const &);
        
        std::vector<boost::shared_ptr<FFmpegSubtitleStream> > subtitle_streams () const {
@@ -111,6 +108,8 @@ public:
                return _first_video;
        }
 
+       bool has_subtitle_during (ContentTimePeriod) const;
+
 private:
        friend class ffmpeg_pts_offset_test;