diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-10-10 15:47:06 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-10-10 15:47:06 +0100 |
| commit | cc4a67b7eb8ecaed076e261960848f70e3e741af (patch) | |
| tree | a41a122341543aee630d6842785d90830298a297 /src/lib/dcp_video_frame.h | |
| parent | d382f34db155ddaf4bb61538c18b87c7564e00b2 (diff) | |
Subs successfully exported with thumbs.
Diffstat (limited to 'src/lib/dcp_video_frame.h')
| -rw-r--r-- | src/lib/dcp_video_frame.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/dcp_video_frame.h b/src/lib/dcp_video_frame.h index 72f885e45..fe2e27966 100644 --- a/src/lib/dcp_video_frame.h +++ b/src/lib/dcp_video_frame.h @@ -31,6 +31,7 @@ class ServerDescription; class Scaler; class Image; class Log; +class Subtitle; /** @class EncodedData * @brief Container for J2K-encoded data. @@ -105,7 +106,7 @@ public: class DCPVideoFrame { public: - DCPVideoFrame (boost::shared_ptr<Image>, Size, int, Scaler const *, int, float, std::string, int, int, Log *); + DCPVideoFrame (boost::shared_ptr<Image>, boost::shared_ptr<Subtitle>, Size, int, Scaler const *, int, float, std::string, int, int, Log *); virtual ~DCPVideoFrame (); boost::shared_ptr<EncodedData> encode_locally (); @@ -120,6 +121,7 @@ private: void write_encoded (boost::shared_ptr<const Options>, uint8_t *, int); boost::shared_ptr<Image> _input; ///< the input image + boost::shared_ptr<Subtitle> _subtitle; ///< any subtitle that should be on the image Size _out_size; ///< the required size of the output, in pixels int _padding; Scaler const * _scaler; ///< scaler to use |