diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-02-25 10:09:33 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-02-25 10:09:33 -0200 |
| commit | dc6e8817d776cdb670fd1db1cb48f2ee25c91717 (patch) | |
| tree | 677d3c5ec66470c67ef759f05bc10651b19be25e /linux/include | |
| parent | 72fadf90dd75161b532265142351354510a62e3c (diff) | |
| parent | 29dc3ffaee320cff68d0ef8a2d9e2e0f112df29d (diff) | |
| download | mediapointer-dvb-s2-dc6e8817d776cdb670fd1db1cb48f2ee25c91717.tar.gz mediapointer-dvb-s2-dc6e8817d776cdb670fd1db1cb48f2ee25c91717.tar.bz2 | |
merge: http://linuxtv.org/hg/~hverkuil/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
There's something weird with mercurial... sometimes, hg merge doesn't
work. Instead, I need to do:
hg update
hg merge -r <the other head>
hg commit
This way, the diff patch will show what happened with the first head,
instead of the merging changes added by the newer one :(
Anyway, since each individual patch can be seem at the history, it will
work.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/include')
| -rw-r--r-- | linux/include/linux/dvb/version.h | 2 | ||||
| -rw-r--r-- | linux/include/linux/videodev2.h | 7 | ||||
| -rw-r--r-- | linux/include/media/cx2341x.h | 2 | ||||
| -rw-r--r-- | linux/include/media/v4l2-chip-ident.h | 4 |
4 files changed, 9 insertions, 6 deletions
diff --git a/linux/include/linux/dvb/version.h b/linux/include/linux/dvb/version.h index 6183c9c48..126e0c26c 100644 --- a/linux/include/linux/dvb/version.h +++ b/linux/include/linux/dvb/version.h @@ -24,6 +24,6 @@ #define _DVBVERSION_H_ #define DVB_API_VERSION 3 -#define DVB_API_VERSION_MINOR 1 +#define DVB_API_VERSION_MINOR 2 #endif /*_DVBVERSION_H_*/ diff --git a/linux/include/linux/videodev2.h b/linux/include/linux/videodev2.h index 8a5aabb84..76af1e16a 100644 --- a/linux/include/linux/videodev2.h +++ b/linux/include/linux/videodev2.h @@ -1387,10 +1387,9 @@ struct v4l2_streamparm /* VIDIOC_DBG_G_REGISTER and VIDIOC_DBG_S_REGISTER */ -#define V4L2_CHIP_MATCH_ALWAYS 0 /* Match always (match_chip is not used) */ -#define V4L2_CHIP_MATCH_HOST 1 /* Match against chip ID on host (0 for the host) */ -#define V4L2_CHIP_MATCH_I2C_DRIVER 2 /* Match against I2C driver ID */ -#define V4L2_CHIP_MATCH_I2C_ADDR 3 /* Match against I2C 7-bit address */ +#define V4L2_CHIP_MATCH_HOST 0 /* Match against chip ID on host (0 for the host) */ +#define V4L2_CHIP_MATCH_I2C_DRIVER 1 /* Match against I2C driver ID */ +#define V4L2_CHIP_MATCH_I2C_ADDR 2 /* Match against I2C 7-bit address */ struct v4l2_register { __u32 match_type; /* Match type */ diff --git a/linux/include/media/cx2341x.h b/linux/include/media/cx2341x.h index 583b0621f..38c12fed7 100644 --- a/linux/include/media/cx2341x.h +++ b/linux/include/media/cx2341x.h @@ -166,7 +166,7 @@ void cx2341x_log_status(struct cx2341x_mpeg_params *p, const char *prefix); #define CX2341X_ENC_SET_PLACEHOLDER 0xd7 #define CX2341X_ENC_MUTE_VIDEO 0xd9 #define CX2341X_ENC_MUTE_AUDIO 0xda -#define CX2341X_ENC_UNKNOWN 0xdb +#define CX2341X_ENC_SET_VERT_CROP_LINE 0xdb #define CX2341X_ENC_MISC 0xdc /* OSD API, specific to the cx23415 */ diff --git a/linux/include/media/v4l2-chip-ident.h b/linux/include/media/v4l2-chip-ident.h index 67a34d528..5698fcd1d 100644 --- a/linux/include/media/v4l2-chip-ident.h +++ b/linux/include/media/v4l2-chip-ident.h @@ -55,6 +55,10 @@ enum { /* OmniVision sensors - range 250-299 */ V4L2_IDENT_OV7670 = 250, + + /* Conexant MPEG encoder/decoders: range 410-420 */ + V4L2_IDENT_CX23415 = 415, + V4L2_IDENT_CX23416 = 416, }; #endif |