summaryrefslogtreecommitdiff
path: root/linux/include
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2006-06-18 21:54:20 +0200
committerHans Verkuil <hverkuil@xs4all.nl>2006-06-18 21:54:20 +0200
commit6cdc5db5eecbf7385e190aab3718ccfbdc981077 (patch)
treeac296b792c552eb9ba19184c7cf26617b34fb706 /linux/include
parent523686db1e20dffeb8509a4092cb3d8f425ef930 (diff)
downloadmediapointer-dvb-s2-6cdc5db5eecbf7385e190aab3718ccfbdc981077.tar.gz
mediapointer-dvb-s2-6cdc5db5eecbf7385e190aab3718ccfbdc981077.tar.bz2
Put old MPEGCOMP API under #if __KERNEL__ and issue warnings when used.
From: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/include')
-rw-r--r--linux/include/linux/videodev2.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/linux/include/linux/videodev2.h b/linux/include/linux/videodev2.h
index d095481c0..3512e05f7 100644
--- a/linux/include/linux/videodev2.h
+++ b/linux/include/linux/videodev2.h
@@ -306,12 +306,13 @@ struct v4l2_timecode
#define V4L2_TC_USERBITS_8BITCHARS 0x0008
/* The above is based on SMPTE timecodes */
-#if 1
+#ifdef __KERNEL__
/*
* M P E G C O M P R E S S I O N P A R A M E T E R S
*
- * ### WARNING: this is still work-in-progress right now, most likely
- * ### there will be some incompatible changes.
+ * ### WARNING: This experimental MPEG compression API is obsolete.
+ * ### It is replaced by the MPEG controls API.
+ * ### This old API will disappear in the near future!
*
*/
enum v4l2_bitrate_mode {
@@ -1253,7 +1254,7 @@ struct v4l2_streamparm
#define VIDIOC_ENUM_FMT _IOWR ('V', 2, struct v4l2_fmtdesc)
#define VIDIOC_G_FMT _IOWR ('V', 4, struct v4l2_format)
#define VIDIOC_S_FMT _IOWR ('V', 5, struct v4l2_format)
-#if 1 /* experimental */
+#ifdef __KERNEL__
#define VIDIOC_G_MPEGCOMP _IOR ('V', 6, struct v4l2_mpeg_compression)
#define VIDIOC_S_MPEGCOMP _IOW ('V', 7, struct v4l2_mpeg_compression)
#endif