projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master and multifarious hackery.
[dcpomatic.git]
/
src
/
lib
/
dcp_video_frame.h
diff --git
a/src/lib/dcp_video_frame.h
b/src/lib/dcp_video_frame.h
index 6794765acefbc1f7a7f85a9cb57449fa1d3e5fe4..ba49c95a43364a125452c8e515aa33c7d8737dda 100644
(file)
--- a/
src/lib/dcp_video_frame.h
+++ b/
src/lib/dcp_video_frame.h
@@
-107,7
+107,7
@@
class DCPVideoFrame
public:
DCPVideoFrame (
boost::shared_ptr<const Image>, boost::shared_ptr<Subtitle>, libdcp::Size,
public:
DCPVideoFrame (
boost::shared_ptr<const Image>, boost::shared_ptr<Subtitle>, libdcp::Size,
- int, int, float, Scaler const *, int, int,
std::string, int, int, Log *
+ int, int, float, Scaler const *, int, int,
int, int, boost::shared_ptr<Log>
);
virtual ~DCPVideoFrame ();
);
virtual ~DCPVideoFrame ();
@@
-131,11
+131,10
@@
private:
Scaler const * _scaler; ///< scaler to use
int _frame; ///< frame index within the DCP's intrinsic duration
int _frames_per_second; ///< Frames per second that we will use for the DCP
Scaler const * _scaler; ///< scaler to use
int _frame; ///< frame index within the DCP's intrinsic duration
int _frames_per_second; ///< Frames per second that we will use for the DCP
- std::string _post_process; ///< FFmpeg post-processing string to use
int _colour_lut; ///< Colour look-up table to use
int _j2k_bandwidth; ///< J2K bandwidth to use
int _colour_lut; ///< Colour look-up table to use
int _j2k_bandwidth; ///< J2K bandwidth to use
-
Log*
_log; ///< log
+
boost::shared_ptr<Log>
_log; ///< log
opj_image_cmptparm_t _cmptparm[3]; ///< libopenjpeg's opj_image_cmptparm_t
opj_image* _image; ///< libopenjpeg's image container
opj_image_cmptparm_t _cmptparm[3]; ///< libopenjpeg's opj_image_cmptparm_t
opj_image* _image; ///< libopenjpeg's image container