/[gentoo-x86]/x11-base/xorg-server/files/avoid-crash-on-minimized-xv-window.patch
Gentoo

Contents of /x11-base/xorg-server/files/avoid-crash-on-minimized-xv-window.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.2 - (show annotations) (download)
Mon Sep 28 07:41:03 2009 UTC (4 years, 10 months ago) by remi
Branch: MAIN
CVS Tags: HEAD
Changes since 1.1: +0 -0 lines
FILE REMOVED
x11-base/xorg-server: drop old ebuilds, prune ${FILESDIR}
(Portage version: 2.2_rc42/cvs/Linux i686)

1 From: Michel Dänzer <michel@tungstengraphics.com>
2 Date: Thu, 24 May 2007 10:10:05 +0000 (+0200)
3 Subject: Consolidate portPriv->pDraw assignments into xf86XVEnlistPortInWindow.
4 X-Git-Tag: xorg-server-1.3.99.0
5 X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/xserver.git;a=commitdiff;h=649e7f82d8d4333443493056b81eb20d6cf022bc
6
7 Consolidate portPriv->pDraw assignments into xf86XVEnlistPortInWindow.
8
9 This avoids a crash in xf86XVReputVideo and also cleans up the code slightly.
10 ---
11
12 --- a/hw/xfree86/common/xf86xv.c
13 +++ b/hw/xfree86/common/xf86xv.c
14 @@ -979,6 +979,9 @@ xf86XVEnlistPortInWindow(WindowPtr pWin,
15 winPriv->next = PrivRoot;
16 pWin->devPrivates[XF86XVWindowIndex].ptr = (pointer)winPriv;
17 }
18 +
19 + portPriv->pDraw = (DrawablePtr)pWin;
20 +
21 return Success;
22 }
23
24 @@ -1375,7 +1378,6 @@ xf86XVPutVideo(
25 result = xf86XVEnlistPortInWindow((WindowPtr)pDraw, portPriv);
26 if(result != Success) return result;
27
28 - portPriv->pDraw = pDraw;
29 portPriv->type = XvInputMask;
30
31 /* save a copy of these parameters */
32 @@ -1479,7 +1481,6 @@ xf86XVPutStill(
33
34 xf86XVEnlistPortInWindow((WindowPtr)pDraw, portPriv);
35 portPriv->isOn = XV_ON;
36 - portPriv->pDraw = pDraw;
37 portPriv->drw_x = drw_x; portPriv->drw_y = drw_y;
38 portPriv->drw_w = drw_w; portPriv->drw_h = drw_h;
39 portPriv->type = 0; /* no mask means it's transient and should
40 @@ -1529,7 +1530,6 @@ xf86XVGetVideo(
41 result = xf86XVEnlistPortInWindow((WindowPtr)pDraw, portPriv);
42 if(result != Success) return result;
43
44 - portPriv->pDraw = pDraw;
45 portPriv->type = XvOutputMask;
46
47 /* save a copy of these parameters */
48 @@ -1784,7 +1784,6 @@ xf86XVPutImage(
49 (portPriv->AdaptorRec->flags & VIDEO_OVERLAID_IMAGES)) {
50
51 portPriv->isOn = XV_ON;
52 - portPriv->pDraw = pDraw;
53 portPriv->drw_x = drw_x; portPriv->drw_y = drw_y;
54 portPriv->drw_w = drw_w; portPriv->drw_h = drw_h;
55 portPriv->type = 0; /* no mask means it's transient and should

  ViewVC Help
Powered by ViewVC 1.1.20