summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'x11-base/xorg-server/files/avoid-crash-on-minimized-xv-window.patch')
-rw-r--r--x11-base/xorg-server/files/avoid-crash-on-minimized-xv-window.patch55
1 files changed, 0 insertions, 55 deletions
diff --git a/x11-base/xorg-server/files/avoid-crash-on-minimized-xv-window.patch b/x11-base/xorg-server/files/avoid-crash-on-minimized-xv-window.patch
deleted file mode 100644
index 23eeca1..0000000
--- a/x11-base/xorg-server/files/avoid-crash-on-minimized-xv-window.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From: Michel Dänzer <michel@tungstengraphics.com>
-Date: Thu, 24 May 2007 10:10:05 +0000 (+0200)
-Subject: Consolidate portPriv->pDraw assignments into xf86XVEnlistPortInWindow.
-X-Git-Tag: xorg-server-1.3.99.0
-X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/xserver.git;a=commitdiff;h=649e7f82d8d4333443493056b81eb20d6cf022bc
-
-Consolidate portPriv->pDraw assignments into xf86XVEnlistPortInWindow.
-
-This avoids a crash in xf86XVReputVideo and also cleans up the code slightly.
----
-
---- a/hw/xfree86/common/xf86xv.c
-+++ b/hw/xfree86/common/xf86xv.c
-@@ -979,6 +979,9 @@ xf86XVEnlistPortInWindow(WindowPtr pWin,
- winPriv->next = PrivRoot;
- pWin->devPrivates[XF86XVWindowIndex].ptr = (pointer)winPriv;
- }
-+
-+ portPriv->pDraw = (DrawablePtr)pWin;
-+
- return Success;
- }
-
-@@ -1375,7 +1378,6 @@ xf86XVPutVideo(
- result = xf86XVEnlistPortInWindow((WindowPtr)pDraw, portPriv);
- if(result != Success) return result;
-
-- portPriv->pDraw = pDraw;
- portPriv->type = XvInputMask;
-
- /* save a copy of these parameters */
-@@ -1479,7 +1481,6 @@ xf86XVPutStill(
-
- xf86XVEnlistPortInWindow((WindowPtr)pDraw, portPriv);
- portPriv->isOn = XV_ON;
-- portPriv->pDraw = pDraw;
- portPriv->drw_x = drw_x; portPriv->drw_y = drw_y;
- portPriv->drw_w = drw_w; portPriv->drw_h = drw_h;
- portPriv->type = 0; /* no mask means it's transient and should
-@@ -1529,7 +1530,6 @@ xf86XVGetVideo(
- result = xf86XVEnlistPortInWindow((WindowPtr)pDraw, portPriv);
- if(result != Success) return result;
-
-- portPriv->pDraw = pDraw;
- portPriv->type = XvOutputMask;
-
- /* save a copy of these parameters */
-@@ -1784,7 +1784,6 @@ xf86XVPutImage(
- (portPriv->AdaptorRec->flags & VIDEO_OVERLAID_IMAGES)) {
-
- portPriv->isOn = XV_ON;
-- portPriv->pDraw = pDraw;
- portPriv->drw_x = drw_x; portPriv->drw_y = drw_y;
- portPriv->drw_w = drw_w; portPriv->drw_h = drw_h;
- portPriv->type = 0; /* no mask means it's transient and should