diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-08-08 02:04:43 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-08-08 02:13:09 +0300 |
| commit | 17d3e4b36d18f4a653f7c5f6ea2f15fcd3a2f069 (patch) | |
| tree | 5d1910a2ab6381f6b4fb0ffc2834f55f7fef7129 /libao2 | |
| parent | 2ba9df3df3d61a7cc1bde9f897bc77eaaf14b383 (diff) | |
| parent | af76be6e197382af491fadef3fcf821a721c99f5 (diff) | |
| download | mpv-17d3e4b36d18f4a653f7c5f6ea2f15fcd3a2f069.tar.bz2 mpv-17d3e4b36d18f4a653f7c5f6ea2f15fcd3a2f069.tar.xz | |
Merge svn changes up to r27441
Conflicts:
cfg-common-opts.h
command.c
configure
input/input.c
libmpcodecs/dec_video.c
libmpcodecs/vd.c
libmpdemux/stheader.h
libvo/sub.c
libvo/video_out.c
libvo/vo_xv.c
libvo/vosub_vidix.c
libvo/x11_common.c
libvo/x11_common.h
mp_core.h
mplayer.c
stream/stream.h
Diffstat (limited to 'libao2')
| -rw-r--r-- | libao2/ao_esd.c | 2 | ||||
| -rw-r--r-- | libao2/ao_mpegpes.c | 6 | ||||
| -rw-r--r-- | libao2/audio_out.c | 20 |
3 files changed, 12 insertions, 16 deletions
diff --git a/libao2/ao_esd.c b/libao2/ao_esd.c index 83b52093d9..3eb1c2a8bd 100644 --- a/libao2/ao_esd.c +++ b/libao2/ao_esd.c @@ -216,7 +216,7 @@ static int init(int rate_hz, int channels, int format, int flags) * latency is number of samples @ 44.1khz stereo 16 bit * adjust according to rate_hz & bytes_per_sample */ -#ifdef HAVE_ESD_LATENCY +#ifdef CONFIG_ESD_LATENCY esd_latency = esd_get_latency(esd_fd); #else esd_latency = ((channels == 1 ? 2 : 1) * ESD_DEFAULT_RATE * diff --git a/libao2/ao_mpegpes.c b/libao2/ao_mpegpes.c index 3e9f51725a..b1fb17ffde 100644 --- a/libao2/ao_mpegpes.c +++ b/libao2/ao_mpegpes.c @@ -10,10 +10,6 @@ #include "config.h" -#ifdef HAVE_DVB_HEAD -#define HAVE_DVB 1 -#endif - #ifdef HAVE_DVB #include <sys/poll.h> #include <sys/ioctl.h> @@ -52,7 +48,7 @@ static ao_info_t info = #ifdef HAVE_DVB "DVB audio output", #else - "Mpeg-PES audio output", + "MPEG-PES audio output", #endif "mpegpes", "A'rpi", diff --git a/libao2/audio_out.c b/libao2/audio_out.c index 77dd8b61ad..38fad281be 100644 --- a/libao2/audio_out.c +++ b/libao2/audio_out.c @@ -39,22 +39,22 @@ extern ao_functions_t audio_out_pss; const ao_functions_t* const audio_out_drivers[] = { // native: -#ifdef HAVE_DIRECTX +#ifdef CONFIG_DIRECTX &audio_out_dsound, #endif -#ifdef HAVE_WIN32WAVEOUT +#ifdef CONFIG_WIN32WAVEOUT &audio_out_win32, #endif -#ifdef HAVE_COREAUDIO +#ifdef CONFIG_COREAUDIO &audio_out_macosx, #endif #ifdef CONFIG_OSS_AUDIO &audio_out_oss, #endif -#if defined (HAVE_ALSA1X) || defined (HAVE_ALSA9) +#ifdef CONFIG_ALSA &audio_out_alsa, #endif -#ifdef HAVE_ALSA5 +#ifdef CONFIG_ALSA5 &audio_out_alsa5, #endif #ifdef CONFIG_SGI_AUDIO @@ -76,23 +76,23 @@ const ao_functions_t* const audio_out_drivers[] = #ifdef CONFIG_JACK &audio_out_jack, #endif -#ifdef HAVE_NAS +#ifdef CONFIG_NAS &audio_out_nas, #endif -#ifdef HAVE_SDL +#ifdef CONFIG_SDL &audio_out_sdl, #endif #ifdef CONFIG_OPENAL &audio_out_openal, #endif &audio_out_mpegpes, -#ifdef HAVE_DXR2 +#ifdef CONFIG_DXR2 &audio_out_dxr2, #endif -#ifdef HAVE_IVTV +#ifdef CONFIG_IVTV &audio_out_ivtv, #endif -#ifdef HAVE_V4L2_DECODER +#ifdef CONFIG_V4L2_DECODER &audio_out_v4l2, #endif &audio_out_null, |