diff options
| author | Carl Hetherington <cth@carlh.net> | 2022-10-14 01:09:45 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2022-10-14 12:55:36 +0200 |
| commit | 3d09f36531fa77335774ac6fc114d3dbe2fed73c (patch) | |
| tree | d4a9f9446cd0461aec44de87ac06c87973f22659 /src/lib/ffmpeg_encoder.h | |
| parent | 0c6f11c42a4f5d858053da7e9589786c48d31e64 (diff) | |
Use a plain declaration rather than a shared_ptr.
Diffstat (limited to 'src/lib/ffmpeg_encoder.h')
| -rw-r--r-- | src/lib/ffmpeg_encoder.h | 9 |
1 files changed, 6 insertions, 3 deletions
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 |