projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
swaroop: beginnings of DCP -> ecinema support.
[dcpomatic.git]
/
src
/
lib
/
ffmpeg_file_encoder.h
diff --git
a/src/lib/ffmpeg_file_encoder.h
b/src/lib/ffmpeg_file_encoder.h
index 5308947e6e2900b5f6d97a5f936518a67a5f3436..d763c7eaf7c05a02fd0cc58b4b5598e7a4bf8785 100644
(file)
--- a/
src/lib/ffmpeg_file_encoder.h
+++ b/
src/lib/ffmpeg_file_encoder.h
@@
-25,6
+25,7
@@
#include "event_history.h"
#include "audio_mapping.h"
#include "log.h"
#include "event_history.h"
#include "audio_mapping.h"
#include "log.h"
+#include <dcp/key.h>
extern "C" {
#include <libavcodec/avcodec.h>
#include <libavformat/avformat.h>
extern "C" {
#include <libavcodec/avcodec.h>
#include <libavformat/avformat.h>
@@
-41,6
+42,10
@@
public:
ExportFormat,
int x264_crf,
boost::filesystem::path output
ExportFormat,
int x264_crf,
boost::filesystem::path output
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+ , boost::optional<dcp::Key> key
+ , boost::optional<std::string> id
+#endif
);
void video (boost::shared_ptr<PlayerVideo>, dcpomatic::DCPTime);
);
void video (boost::shared_ptr<PlayerVideo>, dcpomatic::DCPTime);