summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--linux/include/linux/videodev2.h2
-rw-r--r--v4l/ChangeLog13
2 files changed, 12 insertions, 3 deletions
diff --git a/linux/include/linux/videodev2.h b/linux/include/linux/videodev2.h
index 4e0edce53..acbfc5255 100644
--- a/linux/include/linux/videodev2.h
+++ b/linux/include/linux/videodev2.h
@@ -221,6 +221,8 @@ struct v4l2_pix_format
/* Vendor-specific formats */
#define V4L2_PIX_FMT_WNVA v4l2_fourcc('W','N','V','A') /* Winnov hw compress */
#define V4L2_PIX_FMT_SN9C10X v4l2_fourcc('S','9','1','0') /* SN9C10x compression */
+#define V4L2_PIX_FMT_PWC1 v4l2_fourcc('P','W','C','1') /* pwc older webcam */
+#define V4L2_PIX_FMT_PWC2 v4l2_fourcc('P','W','C','2') /* pwc newer webcam */
/*
* F O R M A T E N U M E R A T I O N
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index fa3a18f7b..330c27224 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,17 +1,25 @@
+2005-06-17 23:54 nshmyrev
+ * videodev2.h:
+
+ - Add Philips Webcam format.
+ Request from Luc Saillard <luc@saillard.org>.
+
2005-06-17 23:40 nshmyrev
* saa7134-video.c:
- Fix nicam detection on saa7134 cards.
2005-06-17 14:44 mkrufky
- * Makefile, cx88-cards.c, cx88-dvb.c, cx88-i2c.c, cx88-mpeg.c, dvb-pll.c, dvb-pll.h, lgdt3302.c, lgdt3302.h, lgdt3302_priv.h
+ * Makefile, cx88-cards.c, cx88-dvb.c:
+ * cx88-i2c.c, cx88-mpeg.c, dvb-pll.c:
+ * dvb-pll.h, lgdt3302.c, lgdt3302.h, lgdt3302_priv.h:
- added support for LGDT3302 demod for cx88 cards:
DViCO FusionHDTV 3 Gold
Signed-off-by: Mac Michaels <wmichaels1@earthlink.net>
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
- * Make.config
+ * Make.config:
- Allow DVB to compile if kernel is later than 2.6.10
@@ -25,7 +33,6 @@
- Fix detection of ADS PCI saa713x.
->>>>>>> 1.54
2005-06-17 12:25 mchehab
* saa6752hs.c:
- Changed struct to be compatible with older gcc's