Tidy up resource management of FFmpegFileEncoders so that they

are cleaned up correctly when an error occurs.

Adapted from dfac61382f1719f0a879747de43cbc5f9115c2d7 in master.

1 files changed, 6 insertions, 1 deletions

diff --git a/src/lib/ffmpeg_encoder.h b/src/lib/ffmpeg_encoder.h
index 4bd264c8b..3b0bdd170 100644
--- 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;
 };