diff options
Diffstat (limited to 'stream/tv.c')
| -rw-r--r-- | stream/tv.c | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/stream/tv.c b/stream/tv.c index 07fb0270a6..3ce7264691 100644 --- a/stream/tv.c +++ b/stream/tv.c @@ -58,7 +58,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_v4l; extern const tvi_info_t tvi_info_v4l2; extern const tvi_info_t tvi_info_bsdbt848; @@ -67,9 +66,6 @@ static const tvi_info_t* tvi_driver_list[]={ #ifdef CONFIG_TV_V4L2 &tvi_info_v4l2, #endif -#ifdef CONFIG_TV_V4L1 - &tvi_info_v4l, -#endif #ifdef CONFIG_TV_BSDBT848 &tvi_info_bsdbt848, #endif @@ -478,26 +474,6 @@ static int open_tv(tvi_handle_t *tvh) #endif tv_set_norm(tvh,tvh->tv_param->norm); -#ifdef CONFIG_TV_V4L1 - if ( tvh->tv_param->mjpeg ) - { - /* set width to expected value */ - if (tvh->tv_param->width == -1) - { - tvh->tv_param->width = 704/tvh->tv_param->decimation; - } - if (tvh->tv_param->height == -1) - { - if ( tvh->norm != TV_NORM_NTSC ) - tvh->tv_param->height = 576/tvh->tv_param->decimation; - else - tvh->tv_param->height = 480/tvh->tv_param->decimation; - } - mp_tmsg(MSGT_TV, MSGL_INFO, - " MJP: width %d height %d\n", tvh->tv_param->width, tvh->tv_param->height); - } -#endif - /* limits on w&h are norm-dependent -- JM */ if (tvh->tv_param->width != -1 && tvh->tv_param->height != -1) { // first tell the driver both width and height, some drivers do not support setting them independently. |