From 2ad89c5956c7ac8db53b13525f161ffb2c1f26a7 Mon Sep 17 00:00:00 2001 From: uau Date: Wed, 16 Aug 2006 20:04:43 +0000 Subject: Move mpeg aos to the end of the autodetection list. At least mpegpes should be there since it now works without the corresponding vo but is not a particularly good ao overall. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19415 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libao2/audio_out.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'libao2/audio_out.c') diff --git a/libao2/audio_out.c b/libao2/audio_out.c index 45b037c329..7546f43095 100644 --- a/libao2/audio_out.c +++ b/libao2/audio_out.c @@ -74,14 +74,6 @@ extern ao_functions_t audio_out_pss; ao_functions_t* audio_out_drivers[] = { -// vo-related: will fail unless you also do -vo mpegpes/dxr2/ivtv - &audio_out_mpegpes, -#ifdef HAVE_DXR2 - &audio_out_dxr2, -#endif -#ifdef HAVE_IVTV - &audio_out_ivtv, -#endif // native: #ifdef HAVE_DIRECTX &audio_out_dsound, @@ -131,6 +123,13 @@ ao_functions_t* audio_out_drivers[] = #endif #ifdef USE_OPENAL &audio_out_openal, +#endif + &audio_out_mpegpes, +#ifdef HAVE_DXR2 + &audio_out_dxr2, +#endif +#ifdef HAVE_IVTV + &audio_out_ivtv, #endif &audio_out_null, // should not be auto-selected: -- cgit v1.2.3