From dfac61382f1719f0a879747de43cbc5f9115c2d7 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Mon, 17 Aug 2020 13:16:48 +0200
Subject: Tidy up resource management of FFmpegFileEncoders so that they are
 cleaned up correctly when an error occurs.

---
 src/lib/ffmpeg_encoder.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/lib/ffmpeg_encoder.h')

diff --git a/src/lib/ffmpeg_encoder.h b/src/lib/ffmpeg_encoder.h
index 79539acce..542711cc9 100644
--- a/src/lib/ffmpeg_encoder.h
+++ b/src/lib/ffmpeg_encoder.h
@@ -74,13 +74,16 @@ private:
 		std::map<Eyes, boost::shared_ptr<FFmpegFileEncoder> > _encoders;
 	};
 
-	std::list<FileEncoderSet> _file_encoders;
 	int _output_audio_channels;
 
 	mutable boost::mutex _mutex;
 	DCPTime _last_time;
 
 	EventHistory _history;
+	boost::filesystem::path _output;
+	ExportFormat _format;
+	bool _split_reels;
+	int _x264_crf;
 
 	boost::shared_ptr<Butler> _butler;
 };
-- 
cgit v1.2.3