diff options
author | uau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-08-16 20:04:43 +0000 |
---|---|---|
committer | uau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-08-16 20:04:43 +0000 |
commit | 2ad89c5956c7ac8db53b13525f161ffb2c1f26a7 (patch) | |
tree | e04fef51dd60f0086505395fe1690620bea6639f /libao2 | |
parent | 8ccc7ac50d1ed1726cd86c50ae19c4f84c928d2f (diff) | |
download | mpv-2ad89c5956c7ac8db53b13525f161ffb2c1f26a7.tar.bz2 mpv-2ad89c5956c7ac8db53b13525f161ffb2c1f26a7.tar.xz |
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
Diffstat (limited to 'libao2')
-rw-r--r-- | libao2/audio_out.c | 15 |
1 files changed, 7 insertions, 8 deletions
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, @@ -132,6 +124,13 @@ ao_functions_t* audio_out_drivers[] = #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: &audio_out_pcm, |