xserver: Branch 'master'

[Keith Packard]

 Xext/xvdisp.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 44efcdde501d54ca9c3e33ab5b1f699956fc3f9f
Author: Jamey Sharp <jamey at minilop.net>
Date:   Wed Oct 7 09:07:03 2009 -0700

    Fix overlay detection when matching Xv adaptors across screens.
    
    Signed-off-by: Jamey Sharp <jamey at minilop.net>
    Acked-by: Adam Jackson <ajax at redhat.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/Xext/xvdisp.c b/Xext/xvdisp.c
index 04cd11a..5229916 100644
--- a/Xext/xvdisp.c
+++ b/Xext/xvdisp.c
@@ -1912,7 +1912,7 @@ void XineramifyXv(void)
 	    if((pAdapt->type & XvImageMask) && (pAdapt->nImages > 0)) {
 	      hasOverlay = FALSE;
               for(l = 0; l < pAdapt->nAttributes; l++) {
-	         if(!strcmp(pAdapt->name, "XV_COLORKEY")) {
+	         if(!strcmp(pAdapt->pAttributes[l].name, "XV_COLORKEY")) {
 		   hasOverlay = TRUE;
 		   break;
 		 }