The branch, master has been updated
via 683abe0aa771168a17133b44085a3db6eedeeb4c (commit)
via 5da1242c34d3e5a4803da1d6c455ac5b9eb9d961 (commit)
from d9da8692b2f806900964c6a42d4de91f31a7461c (commit)
https://github.com/xbmc/xbmc/commit/683abe0aa771168a17133b44085a3db6eedeeb4c
commit 683abe0aa771168a17133b44085a3db6eedeeb4c
Merge: d9da869 5da1242
Author: Joakim Plate <elupus@...>
Date: Mon Nov 28 04:18:16 2011 -0800
Merge pull request #548 from FernetMenta/mainline
vdpau: fix race condition
https://github.com/xbmc/xbmc/commit/5da1242c34d3e5a4803da1d6c455ac5b9eb9d961
commit 5da1242c34d3e5a4803da1d6c455ac5b9eb9d961
Author: Rainer Hochecker <fernetmenta@...>
Date: Sun Nov 27 17:02:11 2011 +0100
vdpau: fix race condition, drop unneeded lock
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp
index 11b52df..17a988b 100644
--- 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();
}
-----------------------------------------------------------------------
Summary of changes:
xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
hooks/post-receive
--
[xbmc/xbmc]
|