Home Explore Help
Register Sign In
phyus
/
linux-vybrid_public
8
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

V4L/DVB (5730): Remove unused V4L2_CAP_VIDEO_OUTPUT_POS

V4L2_CAP_VIDEO_OUTPUT_POS was initially introduced for 2.6.22 but never
actually used: remove it before the final 2.6.22 is made.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Hans Verkuil 18 years ago
parent
fe818d1d9a
commit
1f137600ca
2 changed files with 2 additions and 3 deletions
Split View Show Diff Stats
  1. 1 1
      drivers/media/video/ivtv/ivtv-cards.h
  2. 1 2
      include/linux/videodev2.h

+ 1 - 1
drivers/media/video/ivtv/ivtv-cards.h
View File 

@@ -86,7 +86,7 @@
 
 			  V4L2_CAP_AUDIO | V4L2_CAP_READWRITE | V4L2_CAP_VBI_CAPTURE | \
 
 			  V4L2_CAP_SLICED_VBI_CAPTURE)
 
 #define IVTV_CAP_DECODER (V4L2_CAP_VBI_OUTPUT | V4L2_CAP_VIDEO_OUTPUT | \
 
-			  V4L2_CAP_SLICED_VBI_OUTPUT | V4L2_CAP_VIDEO_OUTPUT_OVERLAY | V4L2_CAP_VIDEO_OUTPUT_POS)
 
+			  V4L2_CAP_SLICED_VBI_OUTPUT | V4L2_CAP_VIDEO_OUTPUT_OVERLAY)
 
 
 struct ivtv_card_video_input {
 
 	u8  video_type; 	/* video input type */

+ 1 - 2
include/linux/videodev2.h
View File 

@@ -243,8 +243,7 @@ struct v4l2_capability
 
 #define V4L2_CAP_SLICED_VBI_CAPTURE	0x00000040  /* Is a sliced VBI capture device */
 
 #define V4L2_CAP_SLICED_VBI_OUTPUT	0x00000080  /* Is a sliced VBI output device */
 
 #define V4L2_CAP_RDS_CAPTURE		0x00000100  /* RDS data capture */
 
-#define V4L2_CAP_VIDEO_OUTPUT_POS       0x00000200  /* Video output can have x,y coords */
 
-#define V4L2_CAP_VIDEO_OUTPUT_OVERLAY	0x00000400  /* Can do video output overlay */
 
+#define V4L2_CAP_VIDEO_OUTPUT_OVERLAY	0x00000200  /* Can do video output overlay */
 
 
 #define V4L2_CAP_TUNER			0x00010000  /* has a tuner */
 
 #define V4L2_CAP_AUDIO			0x00020000  /* has audio support */