summaryrefslogtreecommitdiff
path: root/src/lib/dcp_video_frame.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2012-10-10 15:47:06 +0100
committerCarl Hetherington <cth@carlh.net>2012-10-10 15:47:06 +0100
commitcc4a67b7eb8ecaed076e261960848f70e3e741af (patch)
treea41a122341543aee630d6842785d90830298a297 /src/lib/dcp_video_frame.cc
parentd382f34db155ddaf4bb61538c18b87c7564e00b2 (diff)
Subs successfully exported with thumbs.
Diffstat (limited to 'src/lib/dcp_video_frame.cc')
-rw-r--r--src/lib/dcp_video_frame.cc7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/lib/dcp_video_frame.cc b/src/lib/dcp_video_frame.cc
index 90826a99f..13d3efcbf 100644
--- a/src/lib/dcp_video_frame.cc
+++ b/src/lib/dcp_video_frame.cc
@@ -72,8 +72,9 @@ using namespace boost;
* @param l Log to write to.
*/
DCPVideoFrame::DCPVideoFrame (
- shared_ptr<Image> yuv, Size out, int p, Scaler const * s, int f, float fps, string pp, int clut, int bw, Log* l)
+ shared_ptr<Image> yuv, shared_ptr<Subtitle> sub, Size out, int p, Scaler const * s, int f, float fps, string pp, int clut, int bw, Log* l)
: _input (yuv)
+ , _subtitle (sub)
, _out_size (out)
, _padding (p)
, _scaler (s)
@@ -296,10 +297,6 @@ DCPVideoFrame::encode_remotely (ServerDescription const * serv)
<< Config::instance()->colour_lut_index () << " "
<< Config::instance()->j2k_bandwidth () << " ";
- for (int i = 0; i < _input->components(); ++i) {
- s << _input->line_size()[i] << " ";
- }
-
socket.write ((uint8_t *) s.str().c_str(), s.str().length() + 1, 30);
for (int i = 0; i < _input->components(); ++i) {