Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix seeking with PTS values exceeding max int #12442

Merged
merged 1 commit into from Jul 8, 2017

Conversation

rbuehlma
Copy link
Contributor

@rbuehlma rbuehlma commented Jul 7, 2017

This is a follow up to #12086

I found some additional places where double got pushed into an int.

@Rechi Rechi requested a review from FernetMenta July 7, 2017 20:18
@Rechi Rechi added Type: Fix non-breaking change which fixes an issue v18 Leia Component: Video labels Jul 7, 2017
@@ -770,16 +770,16 @@ int CEdl::RemoveCutTime(int iSeek) const
return iSeek - iCutTime;
}

int CEdl::RestoreCutTime(int iClock) const
double CEdl::RestoreCutTime(double iClock) const

This comment was marked as spam.

This comment was marked as spam.

if (m_vecCuts[i].action == CUT && iSeek >= m_vecCuts[i].start)
iSeek += m_vecCuts[i].end - m_vecCuts[i].start;
if (m_vecCuts[i].action == CUT && dSeek >= m_vecCuts[i].start)
dSeek += (double)m_vecCuts[i].end - (double)m_vecCuts[i].start;

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

@MartijnKaijser MartijnKaijser added this to the L 18.0-alpha1 milestone Jul 8, 2017
@MartijnKaijser
Copy link
Member

jenkins build this please

@MartijnKaijser MartijnKaijser merged commit e969f12 into xbmc:master Jul 8, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Component: Video Type: Fix non-breaking change which fixes an issue v18 Leia
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants