X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fdcp_video_frame.cc;h=1c1838df79403f046f62511ec84bbe04273e4897;hp=d674393a98023e2e02459c1bc6b8ec6c966d2a42;hb=996b0c06e23bcb6b300d7b8799df94993692e07d;hpb=907735ee6ca162583c7c9d20f5603a6db83a149f

diff --git a/src/lib/dcp_video_frame.cc b/src/lib/dcp_video_frame.cc
index d674393a9..1c1838df7 100644
--- a/src/lib/dcp_video_frame.cc
+++ b/src/lib/dcp_video_frame.cc
@@ -47,7 +47,6 @@
 #include "dcp_video_frame.h"
 #include "lut.h"
 #include "config.h"
-#include "options.h"
 #include "exceptions.h"
 #include "server.h"
 #include "util.h"
@@ -80,7 +79,7 @@ using libdcp::Size;
 DCPVideoFrame::DCPVideoFrame (
 	shared_ptr<const Image> yuv, shared_ptr<Subtitle> sub,
 	Size out, int p, int subtitle_offset, float subtitle_scale,
-	Scaler const * s, int f, int dcp_fps, string pp, int clut, int bw, shared_ptr<Log> l
+	Scaler const * s, int f, int dcp_fps, int clut, int bw, shared_ptr<Log> l
 	)
 	: _input (yuv)
 	, _subtitle (sub)
@@ -91,7 +90,6 @@ DCPVideoFrame::DCPVideoFrame (
 	, _scaler (s)
 	, _frame (f)
 	, _frames_per_second (dcp_fps)
-	, _post_process (pp)
 	, _colour_lut (clut)
 	, _j2k_bandwidth (bw)
 	, _log (l)
@@ -157,10 +155,6 @@ DCPVideoFrame::~DCPVideoFrame ()
 shared_ptr<EncodedData>
 DCPVideoFrame::encode_locally ()
 {
-	if (!_post_process.empty ()) {
-		_input = _input->post_process (_post_process, true);
-	}
-	
 	shared_ptr<Image> prepared = _input->scale_and_convert_to_rgb (_out_size, _padding, _scaler, true);
 
 	if (_subtitle) {
@@ -267,7 +261,7 @@ DCPVideoFrame::encode_locally ()
 	_parameters->tcp_numlayers++;
 	_parameters->cp_disto_alloc = 1;
 	_parameters->cp_rsiz = CINEMA2K;
-	_parameters->cp_comment = strdup (N_("DVD-o-matic"));
+	_parameters->cp_comment = strdup (N_("DCP-o-matic"));
 	_parameters->cp_cinema = CINEMA2K_24;
 
 	/* 3 components, so use MCT */
@@ -334,10 +328,6 @@ DCPVideoFrame::encode_remotely (ServerDescription const * serv)
 	  << N_("frame ") << _frame << N_("\n")
 	  << N_("frames_per_second ") << _frames_per_second << N_("\n");
 
-	if (!_post_process.empty()) {
-		s << N_("post_process ") << _post_process << N_("\n");
-	}
-	
 	s << N_("colour_lut ") << _colour_lut << N_("\n")
 	  << N_("j2k_bandwidth ") << _j2k_bandwidth << N_("\n");