summaryrefslogtreecommitdiffstats
path: root/stream
diff options
context:
space:
mode:
Diffstat (limited to 'stream')
-rw-r--r--stream/tv.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/stream/tv.c b/stream/tv.c
index 57a94fdf82..b0abad6e6d 100644
--- a/stream/tv.c
+++ b/stream/tv.c
@@ -56,7 +56,6 @@ char *tv_channel_last_real;
/* enumerating drivers (like in stream.c) */
extern const tvi_info_t tvi_info_dummy;
-extern const tvi_info_t tvi_info_dshow;
extern const tvi_info_t tvi_info_v4l2;
extern const tvi_info_t tvi_info_bsdbt848;
@@ -68,9 +67,6 @@ static const tvi_info_t* tvi_driver_list[]={
#ifdef CONFIG_TV_BSDBT848
&tvi_info_bsdbt848,
#endif
-#ifdef CONFIG_TV_DSHOW
- &tvi_info_dshow,
-#endif
&tvi_info_dummy,
NULL
};
@@ -464,14 +460,11 @@ 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(CONFIG_TV_V4L2) || defined(CONFIG_TV_DSHOW)
+#if defined(CONFIG_TV_V4L2)
if (0
#ifdef CONFIG_TV_V4L2
|| (!strcmp(tvh->tv_param->driver, "v4l2") && tvh->tv_param->normid >= 0)
#endif
-#ifdef CONFIG_TV_DSHOW
- || (!strcmp(tvh->tv_param->driver, "dshow") && tvh->tv_param->normid >= 0)
-#endif
)
tv_set_norm_i(tvh, tvh->tv_param->normid);
else