summaryrefslogtreecommitdiffstats
path: root/stream/tv.c
diff options
context:
space:
mode:
Diffstat (limited to 'stream/tv.c')
-rw-r--r--stream/tv.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/stream/tv.c b/stream/tv.c
index 1d31f1daf7..58321d5302 100644
--- a/stream/tv.c
+++ b/stream/tv.c
@@ -49,16 +49,16 @@ extern const tvi_info_t tvi_info_bsdbt848;
/** List of drivers in autodetection order */
static const tvi_info_t* tvi_driver_list[]={
-#ifdef HAVE_TV_V4L2
+#ifdef CONFIG_TV_V4L2
&tvi_info_v4l2,
#endif
-#ifdef HAVE_TV_V4L1
+#ifdef CONFIG_TV_V4L1
&tvi_info_v4l,
#endif
-#ifdef HAVE_TV_BSDBT848
+#ifdef CONFIG_TV_BSDBT848
&tvi_info_bsdbt848,
#endif
-#ifdef HAVE_TV_DSHOW
+#ifdef CONFIG_TV_DSHOW
&tvi_info_dshow,
#endif
&tvi_info_dummy,
@@ -404,12 +404,12 @@ static int open_tv(tvi_handle_t *tvh)
/* set some params got from cmdline */
funcs->control(tvh->priv, TVI_CONTROL_SPC_SET_INPUT, &tvh->tv_param->input);
-#if defined(HAVE_TV_V4L2) || defined(HAVE_TV_DSHOW)
+#if defined(CONFIG_TV_V4L2) || defined(CONFIG_TV_DSHOW)
if (0
-#ifdef HAVE_TV_V4L2
+#ifdef CONFIG_TV_V4L2
|| (!strcmp(tvh->tv_param->driver, "v4l2") && tvh->tv_param->normid >= 0)
#endif
-#ifdef HAVE_TV_DSHOW
+#ifdef CONFIG_TV_DSHOW
|| (!strcmp(tvh->tv_param->driver, "dshow") && tvh->tv_param->normid >= 0)
#endif
)
@@ -418,7 +418,7 @@ static int open_tv(tvi_handle_t *tvh)
#endif
tv_set_norm(tvh,tvh->tv_param->norm);
-#ifdef HAVE_TV_V4L1
+#ifdef CONFIG_TV_V4L1
if ( tvh->tv_param->mjpeg )
{
/* set width to expected value */