projects
/
libdcp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More win32 build hacks.
[libdcp.git]
/
src
/
picture_frame.cc
diff --git
a/src/picture_frame.cc
b/src/picture_frame.cc
index 7e6bc1f8f30dfaff8818dfe397b62035243a1f2b..b4d72f6f45713bd07d4878da5227989a45cac9e5 100644
(file)
--- a/
src/picture_frame.cc
+++ b/
src/picture_frame.cc
@@
-37,7
+37,7
@@
using namespace libdcp;
* @param mxf_path Path to the asset's MXF file.
* @param n Frame within the asset, not taking EntryPoint into account.
*/
* @param mxf_path Path to the asset's MXF file.
* @param n Frame within the asset, not taking EntryPoint into account.
*/
-MonoPictureFrame::MonoPictureFrame (string mxf_path, int n)
+MonoPictureFrame::MonoPictureFrame (string mxf_path, int n
, ASDCP::AESDecContext* c
)
{
ASDCP::JP2K::MXFReader reader;
if (ASDCP_FAILURE (reader.OpenRead (mxf_path.c_str()))) {
{
ASDCP::JP2K::MXFReader reader;
if (ASDCP_FAILURE (reader.OpenRead (mxf_path.c_str()))) {
@@
-47,7
+47,7
@@
MonoPictureFrame::MonoPictureFrame (string mxf_path, int n)
/* XXX: unfortunate guesswork on this buffer size */
_buffer = new ASDCP::JP2K::FrameBuffer (4 * Kumu::Megabyte);
/* XXX: unfortunate guesswork on this buffer size */
_buffer = new ASDCP::JP2K::FrameBuffer (4 * Kumu::Megabyte);
- if (ASDCP_FAILURE (reader.ReadFrame (n, *_buffer))) {
+ if (ASDCP_FAILURE (reader.ReadFrame (n, *_buffer
, c
))) {
boost::throw_exception (DCPReadError ("could not read video frame"));
}
}
boost::throw_exception (DCPReadError ("could not read video frame"));
}
}