summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/libreal/audio_decoder.c4
-rw-r--r--src/libreal/xine_decoder.c4
-rw-r--r--src/libw32dll/wine/elfdll.c2
-rw-r--r--src/libw32dll/wine/module.c2
4 files changed, 8 insertions, 4 deletions
diff --git a/src/libreal/audio_decoder.c b/src/libreal/audio_decoder.c
index 002f20f5b..be6d0b762 100644
--- a/src/libreal/audio_decoder.c
+++ b/src/libreal/audio_decoder.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: audio_decoder.c,v 1.43 2004/12/16 13:59:10 mroi Exp $
+ * $Id: audio_decoder.c,v 1.44 2005/10/22 22:09:47 miguelfreitas Exp $
*
* thin layer to use real binary-only codecs in xine
*
@@ -723,6 +723,8 @@ static void *init_class (xine_t *xine, void *data) {
default_real_codec_path = "/usr/lib64/RealPlayer8/Codecs";
if (!stat ("/usr/lib64/RealPlayer9/users/Real/Codecs/drv3.so.6.0", &s))
default_real_codec_path = "/usr/lib64/RealPlayer9/users/Real/Codecs";
+ if (!stat ("/usr/lib/codecs/drv3.so.6.0", &s))
+ default_real_codec_path = "/usr/lib/codecs";
if (!stat ("/usr/lib/win32/drv3.so.6.0", &s))
default_real_codec_path = "/usr/lib/win32";
diff --git a/src/libreal/xine_decoder.c b/src/libreal/xine_decoder.c
index cd6585286..aa9e44907 100644
--- a/src/libreal/xine_decoder.c
+++ b/src/libreal/xine_decoder.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: xine_decoder.c,v 1.76 2004/12/16 13:59:10 mroi Exp $
+ * $Id: xine_decoder.c,v 1.77 2005/10/22 22:09:47 miguelfreitas Exp $
*
* thin layer to use real binary-only codecs in xine
*
@@ -604,6 +604,8 @@ static void *init_class (xine_t *xine, void *data) {
if (!stat ("/usr/lib64/RealPlayer9/users/Real/Codecs/drv3.so.6.0", &s))
default_real_codec_path = "/usr/lib64/RealPlayer9/users/Real/Codecs";
if (!stat ("/usr/lib/win32/drv3.so.6.0", &s))
+ default_real_codec_path = "/usr/lib/codecs";
+ if (!stat ("/usr/lib/codecs/drv3.so.6.0", &s))
default_real_codec_path = "/usr/lib/win32";
real_codec_path = config->register_string (config, "decoder.external.real_codecs_path",
diff --git a/src/libw32dll/wine/elfdll.c b/src/libw32dll/wine/elfdll.c
index d060c5810..7051c1802 100644
--- a/src/libw32dll/wine/elfdll.c
+++ b/src/libw32dll/wine/elfdll.c
@@ -32,7 +32,7 @@ extern DWORD fixup_imports(WINE_MODREF *wm);
extern void dump_exports(HMODULE hModule);
/*---------------- END HACKS ---------------*/
-//char *extra_ld_library_path = "/usr/lib/win32";
+//char *extra_ld_library_path = "/usr/lib/codecs";
struct elfdll_image
{
diff --git a/src/libw32dll/wine/module.c b/src/libw32dll/wine/module.c
index 2c7ddc454..af7f9abcd 100644
--- a/src/libw32dll/wine/module.c
+++ b/src/libw32dll/wine/module.c
@@ -362,7 +362,7 @@ static WIN_BOOL MODULE_FreeLibrary( WINE_MODREF *wm )
HMODULE WINAPI LoadLibraryExA(LPCSTR libname, HANDLE hfile, DWORD flags)
{
WINE_MODREF *wm = 0;
- char* listpath[] = { "", "", "/usr/lib/win32", "/usr/local/lib/win32", 0 };
+ char* listpath[] = { "", "", "/usr/lib/codecs", "/usr/local/lib/codecs", "/usr/lib/win32", "/usr/local/lib/win32", 0 };
char path[512];
char checked[2000];
int i = -1;