From aed71b18b102a043fb33731734547b6f2069eca6 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 29 Dec 2011 03:19:35 +0100 Subject: [PATCH] xbmc: remove VDPAU fix patch Signed-off-by: Stephan Raue --- ...-fix_more_vdpau_crashes_ticket_12243.patch | 76 ------------------- 1 file changed, 76 deletions(-) delete mode 100644 packages/mediacenter/xbmc/patches/xbmc-22ad8e4-911-vdpau-fix_more_vdpau_crashes_ticket_12243.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-22ad8e4-911-vdpau-fix_more_vdpau_crashes_ticket_12243.patch b/packages/mediacenter/xbmc/patches/xbmc-22ad8e4-911-vdpau-fix_more_vdpau_crashes_ticket_12243.patch deleted file mode 100644 index e1d69f9ad8..0000000000 --- a/packages/mediacenter/xbmc/patches/xbmc-22ad8e4-911-vdpau-fix_more_vdpau_crashes_ticket_12243.patch +++ /dev/null @@ -1,76 +0,0 @@ -From a9b48dfd39366c86ac79afb0ed545d1c234165a8 Mon Sep 17 00:00:00 2001 -From: Rainer Hochecker -Date: Sat, 10 Dec 2011 12:20:15 +0100 -Subject: [PATCH 1/2] vdpau: lock graphics context when accessing x11 display - ---- - xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 9 ++++++++- - 1 files changed, 8 insertions(+), 1 deletions(-) - -diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp -index 17a988b..ee02947 100644 ---- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp -+++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp -@@ -670,6 +670,8 @@ void CVDPAU::SetDeinterlacing() - - void CVDPAU::InitVDPAUProcs() - { -+ CSingleLock glock(g_graphicsContext); -+ - char* error; - - (void)dlerror(); -@@ -687,7 +689,6 @@ void CVDPAU::InitVDPAUProcs() - - if (dl_vdp_device_create_x11) - { -- CSingleLock lock(g_graphicsContext); - m_Display = g_Windowing.GetDisplay(); - } - -@@ -776,6 +777,8 @@ void CVDPAU::InitVDPAUProcs() - - void CVDPAU::FiniVDPAUProcs() - { -+ CSingleLock glock(g_graphicsContext); -+ - while (!m_videoSurfaces.empty()) - { - vdpau_render_state *render = m_videoSurfaces.back(); -@@ -928,6 +931,8 @@ bool CVDPAU::ConfigOutputMethod(AVCodecContext *avctx, AVFrame *pFrame) - - FiniOutputMethod(); - -+ CSingleLock glock(g_graphicsContext); -+ - MakePixmap(avctx->width,avctx->height); - - vdp_st = vdp_presentation_queue_target_create_x11(vdp_device, -@@ -976,6 +981,8 @@ bool CVDPAU::ConfigOutputMethod(AVCodecContext *avctx, AVFrame *pFrame) - - bool CVDPAU::FiniOutputMethod() - { -+ CSingleLock glock(g_graphicsContext); -+ - VdpStatus vdp_st; - - if (vdp_flip_queue != VDP_INVALID_HANDLE) --- -1.7.5.4 - - -From 8da716c22f8bd8e3ff9a235e134a7a88de3fac6b Mon Sep 17 00:00:00 2001 -From: Rainer Hochecker -Date: Sat, 10 Dec 2011 12:21:35 +0100 -Subject: [PATCH 2/2] lock graphics context when polling events, display - connection might be in use by e.g. vdpau - ---- - xbmc/windowing/WinEventsSDL.cpp | 10 +++++++++- - 1 files changed, 9 insertions(+), 1 deletions(-) - -diff --git a/xbmc/windowing/WinEventsSDL.cpp b/xbmc/windowing/WinEventsSDL.cpp -index afff390..2e8b869 100644 --- -1.7.5.4 -