Tidy up resource management of FFmpegFileEncoders so that they

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

diff --git a/src/lib/ffmpeg_encoder.h b/src/lib/ffmpeg_encoder.h
index 4bd264c8bdf6a760cdb251d3b4950557632b8e68..3b0bdd170e35f52da28ce707fdfc8d1b07914527 100644 (file)
--- a/src/lib/ffmpeg_encoder.h
+++ b/src/lib/ffmpeg_encoder.h
@@ -84,7 +84,6 @@ private:
                std::map<Eyes, boost::shared_ptr<FFmpegFileEncoder> > _encoders;
        };
 
-       std::list<FileEncoderSet> _file_encoders;
        int _output_audio_channels;
 
        mutable boost::mutex _mutex;
@@ -92,6 +91,12 @@ private:
 
        EventHistory _history;
 
+       boost::filesystem::path _output;
+       ExportFormat _format;
+       bool _split_reels;
+       bool _audio_stream_per_channel;
+       int _x264_crf;
+
        boost::shared_ptr<Butler> _butler;
 };