summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--linux/drivers/media/video/saa7134/saa7134-dvb.c4
-rw-r--r--linux/include/linux/videodev2.h4
-rw-r--r--v4l/ChangeLog27
3 files changed, 32 insertions, 3 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-dvb.c b/linux/drivers/media/video/saa7134/saa7134-dvb.c
index 027773438..2555cbf9a 100644
--- a/linux/drivers/media/video/saa7134/saa7134-dvb.c
+++ b/linux/drivers/media/video/saa7134/saa7134-dvb.c
@@ -1,5 +1,5 @@
/*
- * $Id: saa7134-dvb.c,v 1.35 2005/11/04 05:09:37 mkrufky Exp $
+ * $Id: saa7134-dvb.c,v 1.36 2005/11/04 14:21:09 mchehab Exp $
*
* (c) 2004 Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]
*
@@ -751,7 +751,7 @@ static void philips_tda827xa_pll_sleep(u8 addr, struct dvb_frontend *fe)
struct saa7134_dev *dev = fe->dvb->priv;
static u8 tda827xa_sleep[] = { 0x30, 0x90};
struct i2c_msg tuner_msg = {.addr = addr,.flags = 0,.buf = tda827xa_sleep,
- .len = sizeof(tda827xa_sleep) };
+ .len = sizeof(tda827xa_sleep) };
i2c_transfer(&dev->i2c_adap, &tuner_msg, 1);
}
diff --git a/linux/include/linux/videodev2.h b/linux/include/linux/videodev2.h
index b170e0a82..ec74c990f 100644
--- a/linux/include/linux/videodev2.h
+++ b/linux/include/linux/videodev2.h
@@ -653,6 +653,7 @@ typedef __u64 v4l2_std_id;
#define V4L2_STD_NTSC_M ((v4l2_std_id)0x00001000)
#define V4L2_STD_NTSC_M_JP ((v4l2_std_id)0x00002000)
+#define V4L2_STD_NTSC_443 ((v4l2_std_id)0x00004000)
#define V4L2_STD_SECAM_B ((v4l2_std_id)0x00010000)
#define V4L2_STD_SECAM_D ((v4l2_std_id)0x00020000)
@@ -690,7 +691,8 @@ typedef __u64 v4l2_std_id;
#define V4L2_STD_525_60 (V4L2_STD_PAL_M |\
V4L2_STD_PAL_60 |\
- V4L2_STD_NTSC)
+ V4L2_STD_NTSC |\
+ V4L2_STD_NTSC_443)
#define V4L2_STD_625_50 (V4L2_STD_PAL |\
V4L2_STD_PAL_N |\
V4L2_STD_PAL_Nc |\
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index ef9cb0229..1483d1959 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,30 @@
+2005-11-04 14:19 mchehab
+
+ * ../linux/include/linux/videodev2.h:
+ - Added support for NTSC 4.43 video standard.
+
+ Signed-off-by: Tyler Trafford <tatrafford@comcast.net>
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
+
+2005-11-04 14:16 mchehab
+
+ * ../linux/drivers/media/video/Makefile:
+ * ../linux/drivers/media/video/em28xx/Makefile:
+ * ../linux/drivers/media/video/em28xx/em28xx-video.c:
+ * ../linux/drivers/media/video/ir-kbd-i2c.c: (ir_probe):
+ * ../linux/drivers/media/video/saa7134/saa7134-dvb.c:
+ (philips_tda827xa_pll_sleep):
+ * ../linux/include/linux/videodev2.h:
+
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
+
+2005-11-04 13:52 mchehab
+
+ * ../linux/drivers/media/video/saa7134/saa7134-dvb.c:
+ (philips_tda827xa_pll_sleep):
+
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
+
2005-11-04 13:50 mchehab
* ../linux/drivers/media/video/em28xx/em28xx-cards.c: