[Ffmpeg-cvslog] r5429 - trunk/vhook/imlib2.c

[michael]

Author: michael
Date: Tue May 30 11:21:58 2006
New Revision: 5429

Modified:
   trunk/vhook/imlib2.c

Log:
Support modular X11 path to rgb.txt patch by (Ville Skytt? - scop from SF-bugtracker)


Modified: trunk/vhook/imlib2.c
==============================================================================
--- trunk/vhook/imlib2.c	(original)
+++ trunk/vhook/imlib2.c	Tue May 30 11:21:58 2006
@@ -144,7 +144,9 @@
         char buff[256];
         int done = 0;
 
-        f = fopen("/usr/lib/X11/rgb.txt", "r");
+        f = fopen("/usr/share/X11/rgb.txt", "r");
+        if (!f)
+            f = fopen("/usr/lib/X11/rgb.txt", "r");
         if (!f) {
             fprintf(stderr, "Failed to find rgb.txt\n");
             return -1;