summaryrefslogtreecommitdiffstats
path: root/libao2/audio_out.c
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-03-01 09:45:38 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-03-01 09:45:38 +0000
commit2922e180924b7abf1786a6ad14153dec036e87f7 (patch)
tree5becc58b6f34a91a3af5157b68c8779c9da6f83a /libao2/audio_out.c
parenta09376d67b754690e1c90560df7adf50e4f79fc3 (diff)
downloadmpv-2922e180924b7abf1786a6ad14153dec036e87f7.tar.bz2
mpv-2922e180924b7abf1786a6ad14153dec036e87f7.tar.xz
Merge two #ifdefs.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26134 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libao2/audio_out.c')
-rw-r--r--libao2/audio_out.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/libao2/audio_out.c b/libao2/audio_out.c
index f03b142bbf..9564fdd0da 100644
--- a/libao2/audio_out.c
+++ b/libao2/audio_out.c
@@ -51,10 +51,7 @@ const ao_functions_t* const audio_out_drivers[] =
#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