]>
Commit | Line | Data |
---|---|---|
28e90231 | 1 | diff -urN dshowserver.orig/loader/compat/config.h dshowserver-svn101/loader/compat/config.h |
2 | --- dshowserver.orig/loader/compat/config.h 2009-10-17 23:21:31.000000000 +0200 | |
3 | +++ dshowserver-svn101/loader/compat/config.h 2010-01-09 15:48:58.683806461 +0100 | |
4 | @@ -14,7 +14,7 @@ | |
5 | #define HAVE_VSSCANF 1 | |
c6b5d5ad GS |
6 | /* Win32 DLL support */ |
7 | #define USE_WIN32DLL 1 | |
8 | -#define WIN32_PATH "/usr/lib/win32" | |
9 | +#define WIN32_PATH "/usr/lib/codecs" | |
10 | /* DirectShow support */ | |
11 | #define USE_DIRECTSHOW 1 | |
12 | ||
28e90231 | 13 | diff -urN dshowserver.orig/loader/elfdll.c dshowserver-svn101/loader/elfdll.c |
14 | --- dshowserver.orig/loader/elfdll.c 2009-10-17 23:21:33.000000000 +0200 | |
15 | +++ dshowserver-svn101/loader/elfdll.c 2010-01-09 15:45:54.188724360 +0100 | |
c6b5d5ad GS |
16 | @@ -38,7 +38,7 @@ |
17 | extern void dump_exports(HMODULE hModule); | |
18 | /*---------------- END HACKS ---------------*/ | |
19 | ||
20 | -//char *extra_ld_library_path = "/usr/lib/win32"; | |
21 | +//char *extra_ld_library_path = "/usr/lib/codecs"; | |
22 | extern char* def_path; | |
23 | ||
24 | struct elfdll_image | |
28e90231 | 25 | diff -urN dshowserver.orig/loader/module.c dshowserver-svn101/loader/module.c |
26 | --- dshowserver.orig/loader/module.c 2009-10-17 23:21:33.000000000 +0200 | |
27 | +++ dshowserver-svn101/loader/module.c 2010-01-09 15:48:42.311805474 +0100 | |
c6b5d5ad GS |
28 | @@ -365,7 +365,7 @@ |
29 | HMODULE WINAPI LoadLibraryExA(LPCSTR libname, HANDLE hfile, DWORD flags) | |
30 | { | |
31 | WINE_MODREF *wm = 0; | |
32 | - char* listpath[] = { "", "", "/usr/lib/win32", "/usr/local/lib/win32", 0 }; | |
28e90231 | 33 | + char* listpath[] = { "", "", "/usr/lib/codecs", "/usr/local/lib/win32", 0 }; |
c6b5d5ad GS |
34 | extern char* def_path; |
35 | char path[512]; | |
36 | char checked[2000]; | |
28e90231 | 37 | diff -urN dshowserver.orig/man/dshowserver.1 dshowserver-svn101/man/dshowserver.1 |
38 | --- dshowserver.orig/man/dshowserver.1 2009-10-17 23:21:34.000000000 +0200 | |
39 | +++ dshowserver-svn101/man/dshowserver.1 2010-01-09 15:49:42.628973022 +0100 | |
c6b5d5ad GS |
40 | @@ -38,7 +38,7 @@ |
41 | .SH OPTIONS | |
42 | .IP "-c codec_name" | |
43 | specify codec to use (normally CoreAVCDecoder.ax). This | |
44 | -codec should be installed in /usr/lib/win32 | |
45 | +codec should be installed in /usr/lib/codecs | |
46 | .IP "-s <width>x<height>" | |
47 | Dimensions of video. This is used to define buffer sizes | |
48 | So it must be the maximum resolution that will be displayed |