github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-20 21:07:29 +01:00
Code Releases Activity

10l

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7610 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
arpi 2002-10-06 01:08:04 +00:00
parent d803db3e15
commit 0ab47ea363
2 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libao2/ao_mpegpes.c
View File

@ -17,9 +17,9 @@
#ifdef HAVE_DVB
#include <ost/audio.h>
audioMixer_t dvb_mixer={255,255};
#endif
extern int vo_mpegpes_fd;
extern int vo_mpegpes_fd2;
#endif
#include <errno.h>

41
libao2/audio_out.c
View File

@ -25,9 +25,6 @@ extern ao_functions_t audio_out_null;
#ifdef HAVE_ALSA9
extern ao_functions_t audio_out_alsa9;
#endif
#ifdef HAVE_ESD
extern ao_functions_t audio_out_esd;
#endif
#ifdef HAVE_NAS
extern ao_functions_t audio_out_nas;
#endif
@ -50,30 +47,30 @@ extern ao_functions_t audio_out_plugin;
ao_functions_t* audio_out_drivers[] =
{
#ifdef USE_OSS_AUDIO
&audio_out_oss,
#endif
#ifdef USE_ARTS
&audio_out_arts,
#endif
#ifdef USE_SUN_AUDIO
&audio_out_sun,
#endif
#ifdef USE_SGI_AUDIO
&audio_out_sgi,
#endif
// vo-related: will fail unless you also do -vo mpegpes/dxr2
&audio_out_mpegpes,
#ifdef HAVE_DXR2
&audio_out_dxr2,
#endif
&audio_out_null,
#ifdef HAVE_ALSA5
&audio_out_alsa5,
// native:
#ifdef USE_OSS_AUDIO
&audio_out_oss,
#endif
#ifdef HAVE_ALSA9
&audio_out_alsa9,
#endif
#ifdef HAVE_ESD
&audio_out_esd,
#ifdef HAVE_ALSA5
&audio_out_alsa5,
#endif
#ifdef USE_SGI_AUDIO
&audio_out_sgi,
#endif
#ifdef USE_SUN_AUDIO
&audio_out_sun,
#endif
// wrappers:
#ifdef USE_ARTS
&audio_out_arts,
#endif
#ifdef HAVE_NAS
&audio_out_nas,
@ -81,10 +78,10 @@ ao_functions_t* audio_out_drivers[] =
#ifdef HAVE_SDL
&audio_out_sdl,
#endif
&audio_out_mpegpes,
&audio_out_null,
// should not be auto-selected:
&audio_out_pcm,
&audio_out_plugin,
// &audio_out_pss,
NULL
};