summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac3
-rwxr-xr-xsrc/audio_out/audio_directx_out.c4
2 files changed, 4 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index b17515b03..22f30c88e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1824,7 +1824,8 @@ int has_timeout=sizeof(test.timeout);],
fi
fi
-AC_DEFINE([LIBCDIO_CONFIG_H], 1, [This defined to get of rid system libcdio build configuration])
+AC_DEFINE([LIBCDIO_CONFIG_H], 1, [Get of rid system libcdio build configuration])
+AC_DEFINE([EXTERNAL_LIBCDIO_CONFIG_H], 1, [Get of rid system libcdio build configuration])
AC_SUBST(LIBCDIO_CFLAGS)
AC_SUBST(LIBCDIO_LIBS)
AC_SUBST(LIBISO9660_LIBS)
diff --git a/src/audio_out/audio_directx_out.c b/src/audio_out/audio_directx_out.c
index 54d4d99fd..d2147ac52 100755
--- a/src/audio_out/audio_directx_out.c
+++ b/src/audio_out/audio_directx_out.c
@@ -20,7 +20,7 @@
* audio_directx_out.c, direct sound audio output plugin for xine
* by Matthew Grooms <elon@altavista.com>
*
- * $Id: audio_directx_out.c,v 1.16 2006/07/16 16:18:09 dsalt Exp $
+ * $Id: audio_directx_out.c,v 1.17 2006/09/21 15:01:08 valtri Exp $
*/
/*
@@ -844,7 +844,7 @@ static void *init_class (xine_t *xine, void *data) {
* from this point on, nothing should go wrong anymore
*/
audiox = (audiox_class_t *) xine_xmalloc (sizeof (audiox_class_t));
- if (!ao_directx)
+ if (!audiox)
return NULL;
audiox->driver_class.open_plugin = open_plugin;