diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-01-23 00:25:36 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-01-23 00:25:36 +0000 |
| commit | 0703842433013ac1d5f79c09d7a8361dc2e565c8 (patch) | |
| tree | 1f8985669bea1ee72024e86f927255a667f78e8a /src | |
| parent | 1c724e363a644abaee7efb39d6091e7b30de0fb6 (diff) | |
| parent | 054cc86d5ba734c72780b07a772a55e3a7000a4f (diff) | |
Merge branch 'master' into 1.0
Diffstat (limited to 'src')
| -rw-r--r-- | src/picture_mxf_writer.h | 1 | ||||
| -rw-r--r-- | src/stereo_picture_mxf_writer.cc | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/picture_mxf_writer.h b/src/picture_mxf_writer.h index 9f50f973..bcd8873d 100644 --- a/src/picture_mxf_writer.h +++ b/src/picture_mxf_writer.h @@ -29,6 +29,7 @@ namespace dcp { class PictureMXF; +/** Information about a single frame (either a monoscopic frame or a left *or* right eye stereoscopic frame) */ struct FrameInfo { FrameInfo (uint64_t o, uint64_t s, std::string h) diff --git a/src/stereo_picture_mxf_writer.cc b/src/stereo_picture_mxf_writer.cc index 10c5ea06..ad029b57 100644 --- a/src/stereo_picture_mxf_writer.cc +++ b/src/stereo_picture_mxf_writer.cc @@ -94,7 +94,7 @@ StereoPictureMXFWriter::fake_write (int size) assert (_started); assert (!_finalized); - Kumu::Result_t r = _state->mxf_writer.FakeWriteFrame (size); + Kumu::Result_t r = _state->mxf_writer.FakeWriteFrame (size, _next_eye == EYE_LEFT ? ASDCP::JP2K::SP_LEFT : ASDCP::JP2K::SP_RIGHT); if (ASDCP_FAILURE (r)) { boost::throw_exception (MXFFileError ("error in writing video MXF", _mxf->file().string(), r)); } |