xserver: Branch 'master'

[Alex Deucher]

 hw/xfree86/modes/xf86Crtc.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
diff-tree 19d30c1c771c0f5c9dfc0f4cfb084dd2e528d992 (from 92355314103d2193ca20786915eaf608922a36dc)
Author: Alex Deucher <alex at botch2.(none)>
Date:   Sat Sep 22 17:51:27 2007 -0400

    Revert "Fix possible crash if Xv window is outside of either crtc"
    
    This reverts commit 92355314103d2193ca20786915eaf608922a36dc.
    
    This changes ABI.  False means there was a memory failure of some kind,
    not that the video shouldn't be displayed

diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
index 2fd56a2..d375da8 100644
--- a/hw/xfree86/modes/xf86Crtc.c
+++ b/hw/xfree86/modes/xf86Crtc.c
@@ -2250,9 +2250,7 @@ xf86_crtc_clip_video_helper(ScrnInfoPtr 
 	    REGION_INIT (pScreen, &crtc_region_local, &crtc_box, 1);
 	    crtc_region = &crtc_region_local;
 	    REGION_INTERSECT (pScreen, crtc_region, crtc_region, reg);
-	} else
-	    return FALSE;
-
+	}
 	*crtc_ret = crtc;
     }