diff options
| author | Stefano Pigozzi <stefano.pigozzi@gmail.com> | 2013-11-04 08:31:58 +0100 |
|---|---|---|
| committer | Stefano Pigozzi <stefano.pigozzi@gmail.com> | 2013-11-04 08:31:58 +0100 |
| commit | 90875001793400c01f8290260cec2e284620477f (patch) | |
| tree | e1a05cbe8599e8c27542efe712c21fa1c41d7f97 /stream/tv.c | |
| parent | 5b6eab01af32cdf886f0ae9fc1c50e3aa1584da2 (diff) | |
| parent | 3a831b2c016944c1f976d07c5ee9002c6250d9ac (diff) | |
| download | mpv-90875001793400c01f8290260cec2e284620477f.tar.bz2 mpv-90875001793400c01f8290260cec2e284620477f.tar.xz | |
Merge remote-tracking branch 'origin/have_configure'
Diffstat (limited to 'stream/tv.c')
| -rw-r--r-- | stream/tv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/stream/tv.c b/stream/tv.c index 43a516e202..dd76230a2e 100644 --- a/stream/tv.c +++ b/stream/tv.c @@ -60,7 +60,7 @@ extern const tvi_info_t tvi_info_v4l2; /** List of drivers in autodetection order */ static const tvi_info_t* tvi_driver_list[]={ -#ifdef CONFIG_TV_V4L2 +#if HAVE_TV_V4L2 &tvi_info_v4l2, #endif &tvi_info_dummy, @@ -474,7 +474,7 @@ static int open_tv(tvi_handle_t *tvh) funcs->control(tvh->priv, TVI_CONTROL_SPC_SET_INPUT, &tvh->tv_param->input); if ((!strcmp(tvh->tv_param->driver, "v4l2") && tvh->tv_param->normid >= 0)) - tv_set_norm_i(tvh, tvh->tv_param->normid); + tv_set_norm_i(tvh, tvh->tv_param->normid); else tv_set_norm(tvh,tvh->tv_param->norm); |