summaryrefslogtreecommitdiff
path: root/vhook
diff options
context:
space:
mode:
authorVille Skyttä <scop@users.sourceforge.net>2006-05-30 09:21:58 +0000
committerMichael Niedermayer <michaelni@gmx.at>2006-05-30 09:21:58 +0000
commit22a0e90712a9bdcc7c3c58e2299a9c1f06a86ba6 (patch)
tree60807eab87d4de40ce319aa98b258696b89666c4 /vhook
parent7f21a9a7b8eb428e66bd661760d8f359c5507274 (diff)
Support modular X11 path to rgb.txt patch by (Ville Skyttä - scop from SF-bugtracker)
Originally committed as revision 5429 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'vhook')
-rw-r--r--vhook/imlib2.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/vhook/imlib2.c b/vhook/imlib2.c
index 1e6da37a40..35a19252d3 100644
--- a/vhook/imlib2.c
+++ b/vhook/imlib2.c
@@ -144,7 +144,9 @@ int Configure(void **ctxp, int argc, char *argv[])
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;