git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
media
/
video
/
zoran.h
diff --git
a/drivers/media/video/zoran.h
b/drivers/media/video/zoran.h
index
0166f55
..
8fb4a34
100644
(file)
--- a/
drivers/media/video/zoran.h
+++ b/
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_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
#if VIDEO_MAX_FRAME <= 32
# define V4L_MAX_FRAME 32
@@
-191,6
+191,9
@@
enum card_type {
/* Iomega */
BUZ,
/* Iomega */
BUZ,
+ /* AverMedia */
+ AVS6EYES,
+
/* total number of cards */
NUM_CARDS
};
/* total number of cards */
NUM_CARDS
};
@@
-264,7
+267,7
@@
struct zoran_v4l_settings {
};
/* whoops, this one is undeclared if !v4l2 */
};
/* whoops, this one is undeclared if !v4l2 */
-#ifndef
HAVE
_V4L2
+#ifndef
CONFIG_VIDEO
_V4L2
struct v4l2_jpegcompression {
int quality;
int APPn;
struct v4l2_jpegcompression {
int quality;
int APPn;
@@
-379,6
+382,9
@@
struct card_info {
/* is the /GWS line conected? */
u8 gws_not_connected;
/* is the /GWS line conected? */
u8 gws_not_connected;
+ /* avs6eyes mux setting */
+ u8 input_mux;
+
void (*init) (struct zoran * zr);
};
void (*init) (struct zoran * zr);
};