Permalink
Browse files

Merge pull request #865 from taxigps/vobsub2

fixed: vobsub - lose subtitles
  • Loading branch information...
2 parents f72dfdc + db018ce commit 14ef6856b1b09351cdb682889b6d2d9ab33a44d7 @taxigps taxigps committed Apr 8, 2012
Showing with 5 additions and 5 deletions.
  1. +3 −4 xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxVobsub.cpp
  2. +2 −1 xbmc/cores/dvdplayer/DVDPlayerVideo.cpp
View
7 xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxVobsub.cpp
@@ -138,11 +138,10 @@ bool CDVDDemuxVobsub::SeekTime(int time, bool backwords, double* startpts)
if(m_Timestamp->pts > pts)
break;
}
- if(backwords)
- return true;
-
- if(m_Timestamps.begin() != m_Timestamp)
+ for(unsigned i=0;i<m_Streams.size() && m_Timestamps.begin() != m_Timestamp;i++)
+ {
m_Timestamp--;
+ }
return true;
}
View
3 xbmc/cores/dvdplayer/DVDPlayerVideo.cpp
@@ -863,7 +863,8 @@ int CDVDPlayerVideo::GetLevel()
void CDVDPlayerVideo::ProcessOverlays(DVDVideoPicture* pSource, double pts)
{
// remove any overlays that are out of time
- m_pOverlayContainer->CleanUp(pts - m_iSubtitleDelay);
+ if (m_started)
+ m_pOverlayContainer->CleanUp(pts - m_iSubtitleDelay);
enum EOverlay
{ OVERLAY_AUTO // select mode auto

0 comments on commit 14ef685

Please sign in to comment.