diff options
author | Tony Luck <tony.luck@intel.com> | 2005-06-29 15:21:41 -0700 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2005-06-29 15:21:41 -0700 |
commit | d18bfacff20f08aecf01bb971b110ca108eef3c7 (patch) | |
tree | 255f862839c593c796e609328575b611e3f56cf3 /drivers/media/video/bttvp.h | |
parent | [IA64] Fix another IA64 preemption problem (diff) | |
parent | [PATCH] Fix get_request nastiness (diff) | |
download | linux-dev-d18bfacff20f08aecf01bb971b110ca108eef3c7.tar.xz linux-dev-d18bfacff20f08aecf01bb971b110ca108eef3c7.zip |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'drivers/media/video/bttvp.h')
-rw-r--r-- | drivers/media/video/bttvp.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/media/video/bttvp.h b/drivers/media/video/bttvp.h index 7b6f1e856028..f3293e4a15ad 100644 --- a/drivers/media/video/bttvp.h +++ b/drivers/media/video/bttvp.h @@ -1,5 +1,5 @@ /* - $Id: bttvp.h,v 1.17 2005/02/16 12:14:10 kraxel Exp $ + $Id: bttvp.h,v 1.19 2005/06/16 21:38:45 nsh Exp $ bttv - Bt848 frame grabber driver @@ -326,6 +326,9 @@ struct bttv { int opt_vcr_hack; int opt_whitecrush_upper; int opt_whitecrush_lower; + int opt_uv_ratio; + int opt_full_luma_range; + int opt_coring; /* radio data/state */ int has_radio; |