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/tvi_bsdbt848.c | |
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/tvi_bsdbt848.c')
-rw-r--r-- | stream/tvi_bsdbt848.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/stream/tvi_bsdbt848.c b/stream/tvi_bsdbt848.c index 1ad7778f37..1926a5d45b 100644 --- a/stream/tvi_bsdbt848.c +++ b/stream/tvi_bsdbt848.c @@ -39,7 +39,7 @@ #include <errno.h> #include <sys/param.h> -#ifdef USE_SUN_AUDIO +#ifdef CONFIG_SUN_AUDIO #include <sys/audioio.h> #endif @@ -206,7 +206,7 @@ static tvi_handle_t *tvi_init_bsdbt848(tv_param_t* tv_param) /* set audio device name */ if (!tv_param->adevice) -#ifdef USE_SUN_AUDIO +#ifdef CONFIG_SUN_AUDIO priv->dspdev = strdup("/dev/sound"); #else priv->dspdev = strdup("/dev/dsp"); @@ -845,13 +845,13 @@ return priv->dspbytesread * 1.0 / priv->dsprate; static int get_audio_framesize(priv_t *priv) { int bytesavail; -#ifdef USE_SUN_AUDIO +#ifdef CONFIG_SUN_AUDIO struct audio_info auinf; #endif if(priv->dspready == FALSE) return 0; -#ifdef USE_SUN_AUDIO +#ifdef CONFIG_SUN_AUDIO if(ioctl(priv->dspfd, AUDIO_GETINFO, &auinf) < 0) { mp_msg(MSGT_TV, MSGL_ERR, MSGTR_TV_Bt848IoctlFailed, "AUDIO_GETINFO", strerror(errno)); |