summaryrefslogtreecommitdiffstats
path: root/libao2/audio_out.c
diff options
context:
space:
mode:
authormswitch <mswitch@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-11-14 13:07:08 +0000
committermswitch <mswitch@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-11-14 13:07:08 +0000
commit4eac0279331ccedd1135d972cac0bdfbd4dd08b5 (patch)
treee1433be52fa10bde1c7a6ac9c24bcdc28c8f2c12 /libao2/audio_out.c
parentcf408ccf657e9a83de2a7e15dca5ce2badce34e7 (diff)
downloadmpv-4eac0279331ccedd1135d972cac0bdfbd4dd08b5.tar.bz2
mpv-4eac0279331ccedd1135d972cac0bdfbd4dd08b5.tar.xz
Disable ao_mpegpes if compiled with libvo2
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2901 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libao2/audio_out.c')
-rw-r--r--libao2/audio_out.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libao2/audio_out.c b/libao2/audio_out.c
index 0af78067be..f1f9921900 100644
--- a/libao2/audio_out.c
+++ b/libao2/audio_out.c
@@ -42,7 +42,9 @@ extern ao_functions_t audio_out_sgi;
extern ao_functions_t audio_out_dxr3;
#endif
extern ao_functions_t audio_out_pcm;
+#ifndef USE_LIBVO2
extern ao_functions_t audio_out_mpegpes;
+#endif
extern ao_functions_t audio_out_pss;
ao_functions_t* audio_out_drivers[] =
@@ -73,7 +75,9 @@ ao_functions_t* audio_out_drivers[] =
&audio_out_dxr3,
#endif
&audio_out_pcm,
+#ifndef USE_LIBVO2
&audio_out_mpegpes,
+#endif
// &audio_out_pss,
NULL
};