diff -u /home/attila/src/mplayer/main/libvo/mga_common.c libvo/mga_common.c
--- /home/attila/src/mplayer/main/libvo/mga_common.c	2002-11-20 22:05:53.000000000 +0100
+++ libvo/mga_common.c	2003-01-02 13:01:39.000000000 +0100
@@ -8,6 +8,9 @@
 static void set_window( void );		/* forward declaration to kill warnings */
 #ifdef VO_XMGA
 static void mDrawColorKey( void );	/* forward declaration to kill warnings */
+#ifdef HAVE_XINERAMA
+extern int xinerama_screen;
+#endif
 #endif
 
 static int mga_next_frame=0;
@@ -469,13 +472,28 @@
 
 		 	/* find the screen we are on */
 		 	i = 0;
-		 	while(!(screens[i].x_org <= drwcX && screens[i].y_org <= drwcY &&
-		 	       screens[i].x_org + screens[i].width >= drwcX &&
-		 	       screens[i].y_org + screens[i].height >= drwcY ))
+		 	while(i<num_screens &&
+		 	    ((screens[i].x_org < drwcX) ||
+		 	     (screens[i].y_org < drwcY) ||
+		 	     (screens[i].x_org + screens[i].width >= drwcX) ||
+		 	     (screens[i].y_org + screens[i].height >= drwcY)))
 		 	{
 		 		i++;
 		 	}
 
+			if(i<num_screens)
+			{
+				/* save the screen we are on */
+				xinerama_screen = i;
+			} else {
+				/* oops.. couldnt find the screen we are on
+				 * because the upper left corner left the
+				 * visual range. assume we are still on the
+				 * same screen
+				 */
+				i = xinerama_screen;
+		 	}
+
 		 	/* set drwcX and drwcY to the right values */
 		 	drwcX = drwcX - screens[i].x_org;
 		 	drwcY = drwcY - screens[i].y_org;
diff -u /home/attila/src/mplayer/main/libvo/vo_xvidix.c libvo/vo_xvidix.c
--- /home/attila/src/mplayer/main/libvo/vo_xvidix.c	2002-12-28 00:33:41.000000000 +0100
+++ libvo/vo_xvidix.c	2003-01-02 13:01:23.000000000 +0100
@@ -76,6 +76,10 @@
 
 extern void set_video_eq( int cap );
 
+#ifdef HAVE_XINERAMA
+extern int xinerama_screen;
+#endif
+
 static void set_window(int force_update)
 {
     Window mRoot;
@@ -127,10 +131,26 @@
 	screens = XineramaQueryScreens(mDisplay, &num_screens);
 	
 	/* find the screen we are on */
-	while ((screens[i].x_org <= drwcX) || (screens[i].y_org <= drwcY) ||
+	while (i<num_screens &&
+		(screens[i].x_org < drwcX) || (screens[i].y_org < drwcY) ||
 		(screens[i].x_org + screens[i].width >= drwcX) ||
 		(screens[i].y_org + screens[i].height >= drwcY))
-	    i++;
+	{
+	 	i++;
+	}
+
+	if(i<num_screens)
+	{
+		/* save the screen we are on */
+		xinerama_screen = i;
+	} else {
+		/* oops.. couldnt find the screen we are on
+		 * because the upper left corner left the
+		 * visual range. assume we are still on the
+		 * same screen
+		 */
+		i = xinerama_screen;
+	}
 
 	/* set drwcX and drwcY to the right values */
 	drwcX = drwcX - screens[i].x_org;