diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-07-30 16:39:24 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-07-30 16:39:24 +0300 |
| commit | 04f3909a724a06ca5a5a3921061f2ba9fb9d8787 (patch) | |
| tree | b09b4c45898be2754f156ebba16fa1054f42788d /libao2 | |
| parent | 3a69d65f8d07c54f4c9eb2d9c89ab50e35d0a50d (diff) | |
| parent | 1fdf02e6fbd896c8fcce03992ecdf36144d85714 (diff) | |
| download | mpv-04f3909a724a06ca5a5a3921061f2ba9fb9d8787.tar.bz2 mpv-04f3909a724a06ca5a5a3921061f2ba9fb9d8787.tar.xz | |
Merge svn changes up to r27374
Conflicts:
cfg-common-opts.h
cfg-mplayer.h
command.c
configure
libmpcodecs/dec_video.c
libmpcodecs/vd.c
libmpcodecs/vf_vo.c
libmpdemux/demuxer.h
libmpdemux/stheader.h
mp_core.h
mplayer.c
stream/stream_radio.c
Diffstat (limited to 'libao2')
| -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 754e6a11f4..77dd8b61ad 100644 --- a/libao2/audio_out.c +++ b/libao2/audio_out.c @@ -48,7 +48,7 @@ const ao_functions_t* const audio_out_drivers[] = #ifdef HAVE_COREAUDIO &audio_out_macosx, #endif -#ifdef USE_OSS_AUDIO +#ifdef CONFIG_OSS_AUDIO &audio_out_oss, #endif #if defined (HAVE_ALSA1X) || defined (HAVE_ALSA9) @@ -57,23 +57,23 @@ const ao_functions_t* const audio_out_drivers[] = #ifdef HAVE_ALSA5 &audio_out_alsa5, #endif -#ifdef USE_SGI_AUDIO +#ifdef CONFIG_SGI_AUDIO &audio_out_sgi, #endif -#ifdef USE_SUN_AUDIO +#ifdef CONFIG_SUN_AUDIO &audio_out_sun, #endif // wrappers: -#ifdef USE_ARTS +#ifdef CONFIG_ARTS &audio_out_arts, #endif -#ifdef USE_ESD +#ifdef CONFIG_ESD &audio_out_esd, #endif -#ifdef USE_PULSE +#ifdef CONFIG_PULSE &audio_out_pulse, #endif -#ifdef USE_JACK +#ifdef CONFIG_JACK &audio_out_jack, #endif #ifdef HAVE_NAS @@ -82,7 +82,7 @@ const ao_functions_t* const audio_out_drivers[] = #ifdef HAVE_SDL &audio_out_sdl, #endif -#ifdef USE_OPENAL +#ifdef CONFIG_OPENAL &audio_out_openal, #endif &audio_out_mpegpes, |