openshot/libopenshot
0
0
Fork 0
mirror of https://github.com/OpenShot/libopenshot.git synced 2026-03-02 08:53:52 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into json-parsing

Browse Source
This commit is contained in:
Frank Dana
2020-01-20 15:25:40 -05:00
committed by GitHub
parent 09ae8f1e00 49972b21e9
commit 8ea7449363
35 changed files with 966 additions and 344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/FrameMapper.cpp
View File

@@ -235,7 +235,7 @@ void FrameMapper::Init()
int64_t start_samples_frame = 1;
int start_samples_position = 0;
for (int64_t field = 1; field <= fields.size(); field++)
for (std::vector<Field>::size_type field = 1; field <= fields.size(); field++)
{
// Get the current field
Field f = fields[field - 1];
@@ -337,7 +337,7 @@ MappedFrame FrameMapper::GetMappedFrame(int64_t TargetFrameNumber)
// frame too small, return error
throw OutOfBoundsFrame("An invalid frame was requested.", TargetFrameNumber, frames.size());
else if (TargetFrameNumber > frames.size())
else if (TargetFrameNumber > (int64_t)frames.size())
// frame too large, set to end frame
TargetFrameNumber = frames.size();