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 /stream/audio_in.h | |
| 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 'stream/audio_in.h')
| -rw-r--r-- | stream/audio_in.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/stream/audio_in.h b/stream/audio_in.h index 97bd534433..735e9f4e0e 100644 --- a/stream/audio_in.h +++ b/stream/audio_in.h @@ -19,7 +19,7 @@ typedef struct { } ai_alsa_t; #endif -#ifdef USE_OSS_AUDIO +#ifdef CONFIG_OSS_AUDIO typedef struct { char *device; @@ -46,7 +46,7 @@ typedef struct #if defined(HAVE_ALSA9) || defined(HAVE_ALSA1X) ai_alsa_t alsa; #endif -#ifdef USE_OSS_AUDIO +#ifdef CONFIG_OSS_AUDIO ai_oss_t oss; #endif } audio_in_t; @@ -66,7 +66,7 @@ int ai_alsa_init(audio_in_t *ai); int ai_alsa_xrun(audio_in_t *ai); #endif -#ifdef USE_OSS_AUDIO +#ifdef CONFIG_OSS_AUDIO int ai_oss_set_samplerate(audio_in_t *ai); int ai_oss_set_channels(audio_in_t *ai); int ai_oss_init(audio_in_t *ai); |