diff options
| author | jhurst <jhurst@cinecert.com> | 2021-05-11 14:58:22 -0700 |
|---|---|---|
| committer | jhurst <jhurst@cinecert.com> | 2021-05-11 14:58:22 -0700 |
| commit | e5b0a7dbeaaa2b16ea63d7265ed7413f8de2df10 (patch) | |
| tree | 96cfac1cf70ae0c06bf7e6becc8d0ca9d0214f25 /src/AS_02_PCM.cpp | |
| parent | b14d706a72c706c9c59dbdf64a9e41f32465e060 (diff) | |
| parent | 3ca74908e673c88ca0ef4350fb74df184aab3332 (diff) | |
merge origin/master
Diffstat (limited to 'src/AS_02_PCM.cpp')
| -rw-r--r-- | src/AS_02_PCM.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/AS_02_PCM.cpp b/src/AS_02_PCM.cpp index fd00198..d034ffb 100644 --- a/src/AS_02_PCM.cpp +++ b/src/AS_02_PCM.cpp @@ -151,7 +151,7 @@ AS_02::PCM::MXFReader::h__Reader::OpenRead(const std::string& filename, const AS // ASDCP::Result_t AS_02::PCM::MXFReader::h__Reader::ReadFrame(ui32_t FrameNum, ASDCP::PCM::FrameBuffer& FrameBuf, - ASDCP::AESDecContext* Ctx, ASDCP::HMACContext* HMAC) + ASDCP::AESDecContext*, ASDCP::HMACContext*) { if ( ! m_File.IsOpen() ) { @@ -168,7 +168,7 @@ AS_02::PCM::MXFReader::h__Reader::ReadFrame(ui32_t FrameNum, ASDCP::PCM::FrameBu ui64_t position = m_ClipEssenceBegin + offset; Result_t result = RESULT_OK; - if ( m_File.Tell() != position ) + if ( m_File.Tell() != static_cast<Kumu::fpos_t>(position) ) { result = m_File.Seek(position); } |