Browse files

Merge pull request #548 from FernetMenta/mainline

vdpau: fix race condition
  • Loading branch information...
2 parents d9da869 + 5da1242 commit 683abe0aa771168a17133b44085a3db6eedeeb4c @elupus elupus committed Nov 28, 2011
Showing with 3 additions and 5 deletions.
  1. +3 −5 xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp
View
8 xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp
@@ -368,12 +368,10 @@ void CVDPAU::OnLostDevice()
{
CLog::Log(LOGNOTICE,"CVDPAU::OnLostDevice event");
- { CExclusiveLock lock(m_DecoderSection);
- FiniVDPAUOutput();
- FiniVDPAUProcs();
- }
+ CExclusiveLock lock(m_DecoderSection);
+ FiniVDPAUOutput();
+ FiniVDPAUProcs();
- CExclusiveLock lock(m_DisplaySection);
m_DisplayState = VDPAU_LOST;
m_DisplayEvent.Reset();
}

0 comments on commit 683abe0

Please sign in to comment.