Skip to content
Browse files

Merge pull request #539 from FernetMenta/mainline

vdpau: fix potential deadlock
  • Loading branch information...
2 parents 0b77036 + 8c4ba7f commit cf306695d743274030de6bc6232c9f729e36dfbc @elupus elupus committed Nov 19, 2011
Showing with 2 additions and 2 deletions.
  1. +2 −2 xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp
View
4 xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp
@@ -1280,12 +1280,12 @@ int CVDPAU::Decode(AVCodecContext *avctx, AVFrame *pFrame)
VdpStatus vdp_st;
VdpTime time;
- CSharedLock lock(m_DecoderSection);
-
int result = Check(avctx);
if (result)
return result;
+ CSharedLock lock(m_DecoderSection);
+
if (!vdpauConfigured)
return VC_ERROR;

0 comments on commit cf30669

Please sign in to comment.
Something went wrong with that request. Please try again.