Merge pull request #548 from FernetMenta/mainline

vdpau: fix race condition
xbmc · Nov 28, 2011 · 683abe0 · 683abe0
2 parents d9da869 + 5da1242
commit 683abe0
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp b/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();
 }