diff options
| author | wm4 <wm4@mplayer2.org> | 2012-03-05 22:24:57 +0100 |
|---|---|---|
| committer | wm4 <wm4@mplayer2.org> | 2012-03-05 22:24:57 +0100 |
| commit | 8dc0743571630a08fd40fa88aa09b12b4ce65bf2 (patch) | |
| tree | e1c4465768635d77954b5fd21ae726444ee4f48a /libao2/audio_out.c | |
| parent | aebdf4f153438497b9310bd1417b5216f07e043b (diff) | |
| parent | afecdb681bed81b5df0ed18a300c68be603dfdf9 (diff) | |
| download | mpv-8dc0743571630a08fd40fa88aa09b12b4ce65bf2.tar.bz2 mpv-8dc0743571630a08fd40fa88aa09b12b4ce65bf2.tar.xz | |
Merge remote-tracking branch 'origin/master' into my_master
Conflicts:
mplayer.c
screenshot.c
Diffstat (limited to 'libao2/audio_out.c')
| -rw-r--r-- | libao2/audio_out.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/libao2/audio_out.c b/libao2/audio_out.c index b1b5c0e901..a91a0d6d72 100644 --- a/libao2/audio_out.c +++ b/libao2/audio_out.c @@ -41,7 +41,6 @@ extern const struct ao_driver audio_out_pulse; extern const struct ao_driver audio_out_jack; extern const struct ao_driver audio_out_openal; extern const struct ao_driver audio_out_null; -extern const struct ao_driver audio_out_alsa5; extern const struct ao_driver audio_out_alsa; extern const struct ao_driver audio_out_nas; extern const struct ao_driver audio_out_sdl; @@ -83,9 +82,6 @@ static const struct ao_driver * const audio_out_drivers[] = { #ifdef CONFIG_OSS_AUDIO &audio_out_oss, #endif -#ifdef CONFIG_ALSA5 - &audio_out_alsa5, -#endif #ifdef CONFIG_SGI_AUDIO &audio_out_sgi, #endif |