diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-10 02:33:02 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-10 02:33:02 -0300 |
| commit | a5f0c1eb5516fb321c59ba6adb6437288b5b20bf (patch) | |
| tree | 130b457eae2dd2e44bd82889b24c69d337682242 /linux/include | |
| parent | 9469f9975ef9cd00fb23ec27109511c4b2a27350 (diff) | |
| parent | b08b8d66d6c66efb91344fad801cabb14ced6c33 (diff) | |
| download | mediapointer-dvb-s2-a5f0c1eb5516fb321c59ba6adb6437288b5b20bf.tar.gz mediapointer-dvb-s2-a5f0c1eb5516fb321c59ba6adb6437288b5b20bf.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/dibcom
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/include')
| -rw-r--r-- | linux/include/media/v4l2-chip-ident.h | 6 | ||||
| -rw-r--r-- | linux/include/media/v4l2-ioctl.h | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/linux/include/media/v4l2-chip-ident.h b/linux/include/media/v4l2-chip-ident.h index 70117e748..43684f105 100644 --- a/linux/include/media/v4l2-chip-ident.h +++ b/linux/include/media/v4l2-chip-ident.h @@ -70,6 +70,9 @@ enum { V4L2_IDENT_CX23416 = 416, V4L2_IDENT_CX23418 = 418, + /* module indycam: just ident 2000 */ + V4L2_IDENT_INDYCAM = 2000, + /* module bt819: reserved range 810-819 */ V4L2_IDENT_BT815A = 815, V4L2_IDENT_BT817A = 817, @@ -128,6 +131,9 @@ enum { /* module saa7185: just ident 7185 */ V4L2_IDENT_SAA7185 = 7185, + /* module saa7191: just ident 7191 */ + V4L2_IDENT_SAA7191 = 7191, + /* module wm8739: just ident 8739 */ V4L2_IDENT_WM8739 = 8739, diff --git a/linux/include/media/v4l2-ioctl.h b/linux/include/media/v4l2-ioctl.h index b01c04486..a8b4c0b67 100644 --- a/linux/include/media/v4l2-ioctl.h +++ b/linux/include/media/v4l2-ioctl.h @@ -267,6 +267,7 @@ struct v4l2_ioctl_ops { /* Video standard functions */ extern const char *v4l2_norm_to_name(v4l2_std_id id); +extern void v4l2_video_std_frame_period(int id, struct v4l2_fract *frameperiod); extern int v4l2_video_std_construct(struct v4l2_standard *vs, int id, const char *name); /* Prints the ioctl in a human-readable format */ |