summaryrefslogtreecommitdiffstats
path: root/libao2/audio_out.c
diff options
context:
space:
mode:
authorjoyping <joyping@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-05-12 22:48:15 +0000
committerjoyping <joyping@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-05-12 22:48:15 +0000
commit616ae6dc6c9b733bdb43851dd89cf9d4f16d85f5 (patch)
tree07eef2cea81651f729175d5558f0dcb5fbb9c9ce /libao2/audio_out.c
parent85210d8dad5790ae8bf32b9aacc4c7901e4b2f6f (diff)
downloadmpv-616ae6dc6c9b733bdb43851dd89cf9d4f16d85f5.tar.bz2
mpv-616ae6dc6c9b733bdb43851dd89cf9d4f16d85f5.tar.xz
changes for alsa9/1.x-merge only alsa
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12463 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libao2/audio_out.c')
-rw-r--r--libao2/audio_out.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libao2/audio_out.c b/libao2/audio_out.c
index 08165975c9..44c372152f 100644
--- a/libao2/audio_out.c
+++ b/libao2/audio_out.c
@@ -27,10 +27,10 @@ extern ao_functions_t audio_out_null;
extern ao_functions_t audio_out_alsa5;
#endif
#ifdef HAVE_ALSA9
- extern ao_functions_t audio_out_alsa9;
+ extern ao_functions_t audio_out_alsa;
#endif
#ifdef HAVE_ALSA1X
- extern ao_functions_t audio_out_alsa1x;
+ extern ao_functions_t audio_out_alsa;
#endif
#ifdef HAVE_NAS
extern ao_functions_t audio_out_nas;
@@ -76,10 +76,10 @@ ao_functions_t* audio_out_drivers[] =
&audio_out_oss,
#endif
#ifdef HAVE_ALSA1X
- &audio_out_alsa1x,
+ &audio_out_alsa,
#endif
#ifdef HAVE_ALSA9
- &audio_out_alsa9,
+ &audio_out_alsa,
#endif
#ifdef HAVE_ALSA5
&audio_out_alsa5,