summaryrefslogtreecommitdiff
path: root/src/lib/ffmpeg_encoder.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2019-07-15 01:31:20 +0100
committerCarl Hetherington <cth@carlh.net>2019-07-15 01:31:20 +0100
commit4d11fe7cea71b0564df9a21a3cc706509d12b0d1 (patch)
treeb44b7982aad19aafe31225f4ddbc2461bc974f11 /src/lib/ffmpeg_encoder.h
parent2fc2c321a45f9cfb1d1e09989f346ee6d44c0fa4 (diff)
swaroop: beginnings of DCP -> ecinema support.v2.15.12
Diffstat (limited to 'src/lib/ffmpeg_encoder.h')
-rw-r--r--src/lib/ffmpeg_encoder.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/lib/ffmpeg_encoder.h b/src/lib/ffmpeg_encoder.h
index 687d2981e..d8ffd2c6b 100644
--- a/src/lib/ffmpeg_encoder.h
+++ b/src/lib/ffmpeg_encoder.h
@@ -39,6 +39,10 @@ public:
bool mixdown_to_stereo,
bool split_reels,
int x264_crf
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+ , boost::optional<dcp::Key> key
+ , boost::optional<std::string> id
+#endif
);
void go ();
@@ -64,6 +68,10 @@ private:
bool three_d,
boost::filesystem::path output,
std::string extension
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+ , boost::optional<dcp::Key> key
+ , boost::optional<std::string> id
+#endif
);
boost::shared_ptr<FFmpegFileEncoder> get (Eyes eyes) const;