summaryrefslogtreecommitdiffstats
path: root/libao2/audio_out.c
diff options
context:
space:
mode:
authoranders <anders@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-02-21 16:02:26 +0000
committeranders <anders@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-02-21 16:02:26 +0000
commitee2ed8567e3401469fcf13eb96e42d79c4b32714 (patch)
tree90bb902bb5f99813bba6b2bd07ff6620a0d39e0a /libao2/audio_out.c
parentea1d75800931055c8a04cf76e8b6c914c2ed3e23 (diff)
downloadmpv-ee2ed8567e3401469fcf13eb96e42d79c4b32714.tar.bz2
mpv-ee2ed8567e3401469fcf13eb96e42d79c4b32714.tar.xz
Moved HW dependent mixer stuff to libao and removed master switch
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4789 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libao2/audio_out.c')
-rw-r--r--libao2/audio_out.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/libao2/audio_out.c b/libao2/audio_out.c
index 927d133a17..e08bed4b77 100644
--- a/libao2/audio_out.c
+++ b/libao2/audio_out.c
@@ -34,8 +34,10 @@ extern ao_functions_t audio_out_sun;
#ifdef USE_SGI_AUDIO
extern ao_functions_t audio_out_sgi;
#endif
-extern ao_functions_t audio_out_pcm;
+#ifdef HAVE_DVB
extern ao_functions_t audio_out_mpegpes;
+#endif
+extern ao_functions_t audio_out_pcm;
extern ao_functions_t audio_out_pss;
extern ao_functions_t audio_out_plugin;
@@ -66,8 +68,10 @@ ao_functions_t* audio_out_drivers[] =
#ifdef HAVE_SDL
&audio_out_sdl,
#endif
- &audio_out_pcm,
+#ifdef HAVE_DVB
&audio_out_mpegpes,
+#endif
+ &audio_out_pcm,
&audio_out_plugin,
// &audio_out_pss,
NULL