summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Roitzsch <mroi@users.sourceforge.net>2003-03-09 12:19:13 +0000
committerMichael Roitzsch <mroi@users.sourceforge.net>2003-03-09 12:19:13 +0000
commit1ef7a1bc84c6e05aa9feaee7f518ff808ce53054 (patch)
treeb6a01d4ea2846249eca3d832d185212043ab1876
parent8a3b821e68111c0a30d50f3f398740d53923f74c (diff)
downloadxine-lib-1ef7a1bc84c6e05aa9feaee7f518ff808ce53054.tar.gz
xine-lib-1ef7a1bc84c6e05aa9feaee7f518ff808ce53054.tar.bz2
use windows codec path as provided by configure
CVS patchset: 4388 CVS date: 2003/03/09 12:19:13
-rw-r--r--src/libw32dll/Makefile.am2
-rw-r--r--src/libw32dll/qt_decoder.c6
-rw-r--r--src/libw32dll/w32codec.c6
3 files changed, 7 insertions, 7 deletions
diff --git a/src/libw32dll/Makefile.am b/src/libw32dll/Makefile.am
index 80730e61d..2362a0dff 100644
--- a/src/libw32dll/Makefile.am
+++ b/src/libw32dll/Makefile.am
@@ -1,4 +1,4 @@
-AM_CFLAGS = -I$(srcdir)/wine
+AM_CFLAGS = -I$(srcdir)/wine -DWIN32_PATH=\"@w32_path@\"
#DEBUG_CFLAGS = @DEBUG_CFLAGS@ -I$(srcdir)/wine
diff --git a/src/libw32dll/qt_decoder.c b/src/libw32dll/qt_decoder.c
index 1e9162a79..8aa088866 100644
--- a/src/libw32dll/qt_decoder.c
+++ b/src/libw32dll/qt_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: qt_decoder.c,v 1.16 2003/02/19 02:08:40 tmmm Exp $
+ * $Id: qt_decoder.c,v 1.17 2003/03/09 12:19:13 mroi Exp $
*
* quicktime video/audio decoder plugin, using win32 dlls
* most of this code comes directly from MPlayer
@@ -642,7 +642,7 @@ static void *qta_init_class (xine_t *xine, void *data) {
cfg = xine->config;
win32_def_path = cfg->register_string (cfg, "codec.win32_path",
- "/usr/lib/win32",
+ WIN32_PATH,
_("path to win32 codec dlls"),
NULL, 0, NULL, NULL);
@@ -1195,7 +1195,7 @@ static void *qtv_init_class (xine_t *xine, void *data) {
qtv_class_t *this;
config_values_t *cfg = xine->config;
- win32_def_path = cfg->register_string (cfg, "codec.win32_path", "/usr/lib/win32",
+ win32_def_path = cfg->register_string (cfg, "codec.win32_path", WIN32_PATH,
_("path to win32 codec dlls"),
NULL, 0, NULL, NULL);
diff --git a/src/libw32dll/w32codec.c b/src/libw32dll/w32codec.c
index 8f088e9b6..3a2e5c762 100644
--- a/src/libw32dll/w32codec.c
+++ b/src/libw32dll/w32codec.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: w32codec.c,v 1.117 2003/02/17 03:19:58 miguelfreitas Exp $
+ * $Id: w32codec.c,v 1.118 2003/03/09 12:19:13 mroi Exp $
*
* routines for using w32 codecs
* DirectShow support by Miguel Freitas (Nov/2001)
@@ -1484,7 +1484,7 @@ static void *init_video_decoder_class (xine_t *xine, void *data) {
config_values_t *cfg;
cfg = xine->config;
- win32_def_path = cfg->register_string (cfg, "codec.win32_path", "/usr/lib/win32",
+ win32_def_path = cfg->register_string (cfg, "codec.win32_path", WIN32_PATH,
_("path to win32 codec dlls"),
NULL, 0, NULL, NULL);
@@ -1556,7 +1556,7 @@ static void *init_audio_decoder_class (xine_t *xine, void *data) {
cfg = xine->config;
win32_def_path = cfg->register_string (cfg, "codec.win32_path",
- "/usr/lib/win32",
+ WIN32_PATH,
_("path to win32 codec dlls"),
NULL, 0, NULL, NULL);