diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-12 11:10:42 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-12 11:10:42 -0300 |
| commit | 7787613f5c5a3a00ebd6aca9893ef2c4ad679bc1 (patch) | |
| tree | 4ffb8dbda509405c10b484edacb44807b16c5466 /linux/drivers/media/video/zoran/videocodec.h | |
| parent | 84c19b03d182a3ad1a04fa4be0772ef587225fe6 (diff) | |
| parent | d32bcc1401cca5f2ea369ce78ab70947034b5c8f (diff) | |
| download | mediapointer-dvb-s2-7787613f5c5a3a00ebd6aca9893ef2c4ad679bc1.tar.gz mediapointer-dvb-s2-7787613f5c5a3a00ebd6aca9893ef2c4ad679bc1.tar.bz2 | |
merge: http://jusst.de/hg/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/zoran/videocodec.h')
| -rw-r--r-- | linux/drivers/media/video/zoran/videocodec.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/linux/drivers/media/video/zoran/videocodec.h b/linux/drivers/media/video/zoran/videocodec.h index 1b40df14f..5fc11caf2 100644 --- a/linux/drivers/media/video/zoran/videocodec.h +++ b/linux/drivers/media/video/zoran/videocodec.h @@ -97,7 +97,7 @@ available) - it returns 0 if the mode is possible set_size -> this fn-ref. sets the norm and image size for compression/decompression (returns 0 on success) - the norm param is defined in videodev.h (VIDEO_MODE_*) + the norm param is defined in videodev2.h (V4L2_STD_*) additional setup may be available, too - but the codec should work with some default values even without this @@ -145,9 +145,8 @@ M zr36055[1] 0001 0000c001 00000000 (zr36050[1]) #define __LINUX_VIDEOCODEC_H #include "compat.h" -#include <linux/videodev.h> +#include <linux/videodev2.h> -//should be in videodev.h ??? (VID_DO_....) #define CODEC_DO_COMPRESSION 0 #define CODEC_DO_EXPANSION 1 @@ -238,10 +237,6 @@ struct vfe_settings { __u32 width, height; /* Area to capture */ __u16 decimation; /* Decimation divider */ __u16 flags; /* Flags for capture */ -/* flags are the same as in struct video_capture - see videodev.h: -#define VIDEO_CAPTURE_ODD 0 -#define VIDEO_CAPTURE_EVEN 1 -*/ __u16 quality; /* quality of the video */ }; |