From 3d09f36531fa77335774ac6fc114d3dbe2fed73c Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Fri, 14 Oct 2022 01:09:45 +0200
Subject: Use a plain declaration rather than a shared_ptr.

---
 src/lib/ffmpeg_encoder.h | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

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

diff --git a/src/lib/ffmpeg_encoder.h b/src/lib/ffmpeg_encoder.h
index 393a6d72e..2d5c6af87 100644
--- a/src/lib/ffmpeg_encoder.h
+++ b/src/lib/ffmpeg_encoder.h
@@ -21,12 +21,12 @@
 #ifndef DCPOMATIC_FFMPEG_ENCODER_H
 #define DCPOMATIC_FFMPEG_ENCODER_H
 
+#include "audio_mapping.h"
+#include "butler.h"
 #include "encoder.h"
 #include "event_history.h"
-#include "audio_mapping.h"
 #include "ffmpeg_file_encoder.h"
 
-class Butler;
 
 class FFmpegEncoder : public Encoder
 {
@@ -76,6 +76,9 @@ private:
 		std::map<Eyes, std::shared_ptr<FFmpegFileEncoder>> _encoders;
 	};
 
+	AudioMapping stereo_map() const;
+	AudioMapping many_channel_map() const;
+
 	int _output_audio_channels;
 
 	mutable boost::mutex _mutex;
@@ -89,7 +92,7 @@ private:
 	bool _audio_stream_per_channel;
 	int _x264_crf;
 
-	std::shared_ptr<Butler> _butler;
+	Butler _butler;
 };
 
 #endif
-- 
cgit v1.2.3