diff options
| author |  diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-08-03 15:21:40 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-08-03 15:21:40 +0000 |
| commit | 02135001b44afc5446228228055c9ce7f29df5be (patch) | |
| tree | 9a4243fe1da1f111cafab0a39c1b25720afab34b /stream/tvi_v4l.c | |
| parent | 52d358e3dcd4bc813441f6e23d8d9d212a18d7dd (diff) | |
Change a bunch of video/audio-output-specific preprocessor directives from
a HAVE_ prefix to a CONFIG_ prefix.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27402 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'stream/tvi_v4l.c')
| -rw-r--r-- | stream/tvi_v4l.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/stream/tvi_v4l.c b/stream/tvi_v4l.c index 72af5c4d14..bdaab01d61 100644 --- a/stream/tvi_v4l.c +++ b/stream/tvi_v4l.c @@ -141,7 +141,7 @@ typedef struct { long audio_recv_blocks_total; long audio_sent_blocks_total; long mjpeg_bufsize; -#ifdef HAVE_TV_TELETEXT +#ifdef CONFIG_TV_TELETEXT char *vbi_dev; int vbi_fd; int vbi_bufsize; @@ -675,7 +675,7 @@ static int uninit(priv_t *priv) { unsigned long num; -#ifdef HAVE_TV_TELETEXT +#ifdef CONFIG_TV_TELETEXT priv->vbi_shutdown=1; if(priv->vbi_grabber_thread) pthread_join(priv->vbi_grabber_thread, NULL); @@ -781,7 +781,7 @@ static int get_capture_buffer_size(priv_t *priv) return cnt; } -#ifdef HAVE_TV_TELETEXT +#ifdef CONFIG_TV_TELETEXT static int vbi_init(priv_t* priv,char* device) { int vbi_fd=0; @@ -897,7 +897,7 @@ static void *vbi_grabber(void *data) free(buf); return NULL; } -#endif //HAVE_TV_TELETEXT +#endif /* CONFIG_TV_TELETEXT */ static int start(priv_t *priv) { @@ -1111,7 +1111,7 @@ static int start(priv_t *priv) ioctl(priv->video_fd, VIDIOCSAUDIO, &priv->audio[priv->audio_id]); } -#ifdef HAVE_TV_TELETEXT +#ifdef CONFIG_TV_TELETEXT /* start vbi thread */ if(priv->priv_vbi){ priv->vbi_shutdown = 0; @@ -1511,7 +1511,7 @@ static int control(priv_t *priv, int cmd, void *arg) priv->immediate_mode = 1; return TVI_CONTROL_TRUE; } -#ifdef HAVE_TV_TELETEXT +#ifdef CONFIG_TV_TELETEXT case TVI_CONTROL_VBI_INIT: { void* ptr; |