diff options
author | wm4 <wm4@nowhere> | 2012-10-28 20:09:09 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2012-10-30 19:50:20 +0100 |
commit | a04ad728c59410a13e43c5003da2ccc57fbd1218 (patch) | |
tree | 968f4b043ef4b6e7d6de8ec65fdd9c789e13fe9b /stream/tv.c | |
parent | bf4cf84573de0e117b728e9b41bab94b8f00becd (diff) | |
download | mpv-a04ad728c59410a13e43c5003da2ccc57fbd1218.tar.bz2 mpv-a04ad728c59410a13e43c5003da2ccc57fbd1218.tar.xz |
cleanup: remove references to CONFIG_TV_DSHOW
Diffstat (limited to 'stream/tv.c')
-rw-r--r-- | stream/tv.c | 9 |
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 |