[MPlayer-matrox] upgrade to xorg 7.2 => xmga driver broken

[Gilles Hamel]

Attila Kinali wrote:
>
> Could you please send a unified diff against current svn?
> (see DOCS/tech/patches.txt). I'll have a look as soon
> as i'm back in Switzerland.
>   

Index: libvo/mga_common.c
===================================================================
--- libvo/mga_common.c  (revision 24143)
+++ libvo/mga_common.c  (working copy)
@@ -532,10 +532,17 @@
                                i = xinerama_screen;
                        }

-                       /* set drwcX and drwcY to the right values */
-                       drwcX = drwcX - screens[i].x_org;
-                       drwcY = drwcY - screens[i].y_org;
-                       XFree(screens);
+                       /*
+                         I have only 1 screen with xinerama extension 
enabled by default in xorg 7.2
+                         add test to avoid access array with a negative 
index
+                         xinerama_screen is initialized with -1.
+                        */
+                       if (i>=0) {
+                               /* set drwcX and drwcY to the right 
values */
+                               drwcX = drwcX - screens[i].x_org;
+                               drwcY = drwcY - screens[i].y_org;
+                               XFree(screens);
+                       }
                 }

 #endif

I don't know if it's the best way to fix the issue, but it works fine here.
Could you test with your multi-screen configuration ?

Bye

Gilles