diff options
| author | wm4 <wm4@mplayer2.org> | 2012-01-18 04:18:41 +0100 |
|---|---|---|
| committer | wm4 <wm4@mplayer2.org> | 2012-01-18 04:18:41 +0100 |
| commit | f341b21a90d27977562645fb80f0cbbc2a17af7b (patch) | |
| tree | af4b95b39fa865ddcaa5a448b7e04a0f5e220f57 /libao2/audio_out.c | |
| parent | 4e76c7514f847648cdc9740d6ef997d1653effa8 (diff) | |
| parent | c4093e7d872d2daa485029b8b36661411387ef37 (diff) | |
| download | mpv-f341b21a90d27977562645fb80f0cbbc2a17af7b.tar.bz2 mpv-f341b21a90d27977562645fb80f0cbbc2a17af7b.tar.xz | |
Merge remote-tracking branch 'origin/master' into my_master
Diffstat (limited to 'libao2/audio_out.c')
| -rw-r--r-- | libao2/audio_out.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libao2/audio_out.c b/libao2/audio_out.c index bd06c8fd5f..b1b5c0e901 100644 --- a/libao2/audio_out.c +++ b/libao2/audio_out.c @@ -74,12 +74,15 @@ static const struct ao_driver * const audio_out_drivers[] = { #ifdef CONFIG_COREAUDIO &audio_out_coreaudio, #endif -#ifdef CONFIG_OSS_AUDIO - &audio_out_oss, +#ifdef CONFIG_PULSE + &audio_out_pulse, #endif #ifdef CONFIG_ALSA &audio_out_alsa, #endif +#ifdef CONFIG_OSS_AUDIO + &audio_out_oss, +#endif #ifdef CONFIG_ALSA5 &audio_out_alsa5, #endif @@ -96,21 +99,18 @@ static const struct ao_driver * const audio_out_drivers[] = { #ifdef CONFIG_ESD &audio_out_esd, #endif -#ifdef CONFIG_PULSE - &audio_out_pulse, -#endif #ifdef CONFIG_JACK &audio_out_jack, #endif #ifdef CONFIG_NAS &audio_out_nas, #endif -#ifdef CONFIG_SDL - &audio_out_sdl, -#endif #ifdef CONFIG_OPENAL &audio_out_openal, #endif +#ifdef CONFIG_SDL + &audio_out_sdl, +#endif &audio_out_mpegpes, #ifdef CONFIG_IVTV &audio_out_ivtv, |