Mercurial > mplayer.hg

changeset 26102:5eb017bb1568

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge two #ifdefs.
author diego
date Sat, 01 Mar 2008 09:45:38 +0000
parents a65168348ad5
children 128f089724d3
files libao2/audio_out.c
diffstat 1 files changed, 1 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/libao2/audio_out.c	Sat Mar 01 09:04:00 2008 +0000
+++ b/libao2/audio_out.c	Sat Mar 01 09:45:38 2008 +0000
@@ -51,10 +51,7 @@
 #ifdef USE_OSS_AUDIO
         &audio_out_oss,
 #endif
-#ifdef HAVE_ALSA1X
-        &audio_out_alsa,
-#endif
-#ifdef HAVE_ALSA9
+#if defined (HAVE_ALSA1X) || defined (HAVE_ALSA9)
         &audio_out_alsa,
 #endif
 #ifdef HAVE_ALSA5