Write config.xml with CR/LF terminators on Windows.

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

diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index 3a38f4475333d3f3871e057fb376c56ff3ca2122..640229f23f74a757e39df7368bcec0ccec9ac0a8 100644 (file)
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -45,7 +45,7 @@ struct ffmpeg_pts_offset_test;
 class FFmpegDecoder : public FFmpeg, public Decoder
 {
 public:
-       FFmpegDecoder (boost::shared_ptr<const FFmpegContent>, boost::shared_ptr<Log> log, bool fast);
+       FFmpegDecoder (boost::shared_ptr<const Film> film, boost::shared_ptr<const FFmpegContent>, bool fast);
 
        bool pass ();
        void seek (ContentTime time, bool);
@@ -68,13 +68,12 @@ private:
        void maybe_add_subtitle ();
        boost::shared_ptr<AudioBuffers> deinterleave_audio (boost::shared_ptr<FFmpegAudioStream> stream) const;
 
-       boost::shared_ptr<Log> _log;
-
        std::list<boost::shared_ptr<VideoFilterGraph> > _filter_graphs;
        boost::mutex _filter_graphs_mutex;
 
        ContentTime _pts_offset;
        boost::optional<ContentTime> _current_subtitle_to;
+       /** true if we have a subtitle which has not had emit_stop called for it yet */
        bool _have_current_subtitle;
 
        boost::shared_ptr<Image> _black_image;