diff options
| author | Patrick Boettcher <pb@linuxtv.org> | 2006-07-04 17:58:23 +0200 |
|---|---|---|
| committer | Patrick Boettcher <pb@linuxtv.org> | 2006-07-04 17:58:23 +0200 |
| commit | 8fbac88a9c801be025c283275f2eb6585a5cc454 (patch) | |
| tree | bd82f6b1848d218e56f57805fdc569b9574e8089 /linux/drivers/media/video/zoran.h | |
| parent | c0b0560a9ed6e97eca6da5f8432c0dbb2fe471ad (diff) | |
| parent | 54b507ede0a1c5349b47f84af7d3d0b417467e3a (diff) | |
| download | mediapointer-dvb-s2-8fbac88a9c801be025c283275f2eb6585a5cc454.tar.gz mediapointer-dvb-s2-8fbac88a9c801be025c283275f2eb6585a5cc454.tar.bz2 | |
sync with master
From: Patrick Boettcher <pb@linuxtv.org>
sync with master
Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Diffstat (limited to 'linux/drivers/media/video/zoran.h')
| -rw-r--r-- | linux/drivers/media/video/zoran.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/linux/drivers/media/video/zoran.h b/linux/drivers/media/video/zoran.h index 0dc51a46c..19c6e3aa0 100644 --- a/linux/drivers/media/video/zoran.h +++ b/linux/drivers/media/video/zoran.h @@ -159,7 +159,7 @@ Private IOCTL to set up for displaying MJPEG #define BUZ_MAX_FRAME 256 /* Must be a power of 2 */ #define BUZ_MASK_FRAME 255 /* Must be BUZ_MAX_FRAME-1 */ -#define BUZ_MAX_INPUT 8 +#define BUZ_MAX_INPUT 16 #if VIDEO_MAX_FRAME <= 32 # define V4L_MAX_FRAME 32 @@ -191,6 +191,9 @@ enum card_type { /* Iomega */ BUZ, + /* AverMedia */ + AVS6EYES, + /* total number of cards */ NUM_CARDS }; @@ -379,6 +382,9 @@ struct card_info { /* is the /GWS line conected? */ u8 gws_not_connected; + /* avs6eyes mux setting */ + u8 input_mux; + void (*init) (struct zoran * zr); }; |