diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-05-25 01:07:35 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-05-25 01:07:35 +0100 |
| commit | 996b0c06e23bcb6b300d7b8799df94993692e07d (patch) | |
| tree | 615ff0c372dac97321489e3cb7f316cb4cb9eeec /src/lib/server.cc | |
| parent | 4f03da3aa12525cb8389ddefee629f5d0b2ac0aa (diff) | |
| parent | 907735ee6ca162583c7c9d20f5603a6db83a149f (diff) | |
Merge master and multifarious hackery.
Diffstat (limited to 'src/lib/server.cc')
| -rw-r--r-- | src/lib/server.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/lib/server.cc b/src/lib/server.cc index ca0bec580..07b826946 100644 --- a/src/lib/server.cc +++ b/src/lib/server.cc @@ -111,7 +111,6 @@ Server::process (shared_ptr<Socket> socket) string scaler_id = get_required_string (kv, N_("scaler")); int frame = get_required_int (kv, N_("frame")); int frames_per_second = get_required_int (kv, N_("frames_per_second")); - string post_process = get_optional_string (kv, N_("post_process")); int colour_lut_index = get_required_int (kv, N_("colour_lut")); int j2k_bandwidth = get_required_int (kv, N_("j2k_bandwidth")); Position subtitle_position (get_optional_int (kv, N_("subtitle_x")), get_optional_int (kv, N_("subtitle_y"))); @@ -136,7 +135,7 @@ Server::process (shared_ptr<Socket> socket) DCPVideoFrame dcp_video_frame ( image, sub, out_size, padding, subtitle_offset, subtitle_scale, - scaler, frame, frames_per_second, post_process, colour_lut_index, j2k_bandwidth, _log + scaler, frame, frames_per_second, colour_lut_index, j2k_bandwidth, _log ); shared_ptr<EncodedData> encoded = dcp_video_frame.encode_locally (); |