diff options
Diffstat (limited to 'drivers/media/video/zoran/videocodec.h')
-rw-r--r-- | drivers/media/video/zoran/videocodec.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/media/video/zoran/videocodec.h b/drivers/media/video/zoran/videocodec.h index 97a3bbeda50..5c27b251354 100644 --- a/drivers/media/video/zoran/videocodec.h +++ b/drivers/media/video/zoran/videocodec.h | |||
@@ -97,7 +97,7 @@ | |||
97 | available) - it returns 0 if the mode is possible | 97 | available) - it returns 0 if the mode is possible |
98 | set_size -> this fn-ref. sets the norm and image size for | 98 | set_size -> this fn-ref. sets the norm and image size for |
99 | compression/decompression (returns 0 on success) | 99 | compression/decompression (returns 0 on success) |
100 | the norm param is defined in videodev.h (VIDEO_MODE_*) | 100 | the norm param is defined in videodev2.h (V4L2_STD_*) |
101 | 101 | ||
102 | additional setup may be available, too - but the codec should work with | 102 | additional setup may be available, too - but the codec should work with |
103 | some default values even without this | 103 | some default values even without this |
@@ -144,9 +144,8 @@ M zr36055[1] 0001 0000c001 00000000 (zr36050[1]) | |||
144 | #ifndef __LINUX_VIDEOCODEC_H | 144 | #ifndef __LINUX_VIDEOCODEC_H |
145 | #define __LINUX_VIDEOCODEC_H | 145 | #define __LINUX_VIDEOCODEC_H |
146 | 146 | ||
147 | #include <linux/videodev.h> | 147 | #include <linux/videodev2.h> |
148 | 148 | ||
149 | //should be in videodev.h ??? (VID_DO_....) | ||
150 | #define CODEC_DO_COMPRESSION 0 | 149 | #define CODEC_DO_COMPRESSION 0 |
151 | #define CODEC_DO_EXPANSION 1 | 150 | #define CODEC_DO_EXPANSION 1 |
152 | 151 | ||
@@ -237,10 +236,6 @@ struct vfe_settings { | |||
237 | __u32 width, height; /* Area to capture */ | 236 | __u32 width, height; /* Area to capture */ |
238 | __u16 decimation; /* Decimation divider */ | 237 | __u16 decimation; /* Decimation divider */ |
239 | __u16 flags; /* Flags for capture */ | 238 | __u16 flags; /* Flags for capture */ |
240 | /* flags are the same as in struct video_capture - see videodev.h: | ||
241 | #define VIDEO_CAPTURE_ODD 0 | ||
242 | #define VIDEO_CAPTURE_EVEN 1 | ||
243 | */ | ||
244 | __u16 quality; /* quality of the video */ | 239 | __u16 quality; /* quality of the video */ |
245 | }; | 240 | }; |
246 | 241 | ||