/usr/lib/codecs is preferred /usr/lib/win32 (it is what mplayer uses)

patch by Diego Biurrun

CVS patchset: 7765
CVS date: 2005/10/22 22:09:44

7 files changed, 14 insertions, 10 deletions

diff --git a/configure.ac b/configure.ac
index 3a044dc7c..225d1e574 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2122,7 +2122,7 @@ dnl For win32 libraries location, needed by libw32dll.
 dnl ---------------------------------------------
 
 AC_ARG_WITH(w32-path, AC_HELP_STRING([--with-w32-path=path], [location of WIN32 libraries]),
-            w32_path="$withval", w32_path="/usr/lib/win32")
+            w32_path="$withval", w32_path="/usr/lib/codecs")
 AC_SUBST(w32_path)
 
 
diff --git a/doc/README.opengl b/doc/README.opengl
index c05c1c2c8..89bdbb146 100644
--- a/doc/README.opengl
+++ b/doc/README.opengl
@@ -64,7 +64,7 @@ Problems you might encounter (FAQ)
   video frames could be rendered differently, but xine does not switch back
   to complex rendering techniques for them.
   This also can happen for decoders using the WinAPI for loading windows
-  codecs from /usr/lib/win32. They often decode into interleaved YUY2 video
+  codecs from /usr/lib/codecs. They often decode into interleaved YUY2 video
   instead of planar YUV, which is not yet implemented.
   You have to switch back to more complex rendering techniques like
   '2D_Tex_Fragprog' manually.
diff --git a/doc/faq/faq.sgml b/doc/faq/faq.sgml
index 8fe44d01a..5246c3587 100644
--- a/doc/faq/faq.sgml
+++ b/doc/faq/faq.sgml
@@ -786,7 +786,7 @@
       http://www.mplayerhq.hu/homepage/dload.html
      </ulink>.
      The package is called "essential". Unpack it and move everything you find
-     inside to <filename>/usr/lib/win32</filename> (actually you can place them
+     inside to <filename>/usr/lib/codecs</filename> (actually you can place them
      anywhere you want, e.g. someplace in your home directory, but then you'll
      have to set <parameter>decoder.external.win32_codecs_path</parameter> in your
      xine config file accordingly). Restart xine then and you should be
@@ -811,9 +811,9 @@
       http://www.mplayerhq.hu/homepage/dload.html
      </ulink>.
      The package is called "essential". Unpack it and move everything you
-     find inside to <filename>/usr/lib/win32</filename> and set the
+     find inside to <filename>/usr/lib/codecs</filename> and set the
      <parameter>decoder.external.real_codecs_path</parameter> in your xine config file
-     to <filename>/usr/lib/win32</filename> (actually you can place them
+     to <filename>/usr/lib/codecs</filename> (actually you can place them
      anywhere you want, e.g. someplace in your home directory, but then you'll
      have to set <parameter>decoder.external.real_codecs_path</parameter> accordingly).
      Restart xine then and you should be able to watch Real files/streams.
@@ -850,7 +850,7 @@
       http://www.mplayerhq.hu/homepage/dload.html
      </ulink>.
      The package is called "essential". Unpack it and move everything you find
-     inside to <filename>/usr/lib/win32</filename> (actually you can place them
+     inside to <filename>/usr/lib/codecs</filename> (actually you can place them
      anywhere you want, e.g. someplace in your home directory, but then you'll
      have to set <parameter>decoder.external.win32_codecs_path</parameter> in your
      xine config file accordingly). Restart xine then and you should be
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;