Blob Blame History Raw
Index: gstv4l2vidorient.c
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-good/sys/v4l2/gstv4l2vidorient.c,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 gstv4l2vidorient.c
--- gstv4l2vidorient.c	26 Sep 2006 14:17:54 -0000	1.2
+++ gstv4l2vidorient.c	2 Jun 2008 20:29:15 -0000
@@ -34,6 +34,14 @@
 GST_DEBUG_CATEGORY_STATIC (v4l2vo_debug);
 #define GST_CAT_DEFAULT v4l2vo_debug
 
+/* Those are deprecated calls that have been replaced */
+#ifndef V4L2_CID_HCENTER
+#define V4L2_CID_HCENTER V4L2_CID_PAN_RESET
+#endif
+#ifndef V4L2_CID_VCENTER
+#define V4L2_CID_VCENTER V4L2_CID_TILT_RESET
+#endif
+
 void
 gst_v4l2_video_orientation_interface_init (GstVideoOrientationInterface * klass)
 {
Index: v4l2_calls.c
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-good/sys/v4l2/v4l2_calls.c,v
retrieving revision 1.44
diff -u -p -u -p -r1.44 v4l2_calls.c
--- v4l2_calls.c	31 Jan 2008 16:12:28 -0000	1.44
+++ v4l2_calls.c	2 Jun 2008 20:29:15 -0000
@@ -45,6 +45,14 @@
 
 #include "gstv4l2src.h"
 
+/* Those are ioctl calls */
+#ifndef V4L2_CID_HCENTER
+#define V4L2_CID_HCENTER V4L2_CID_HCENTER_DEPRECATED
+#endif
+#ifndef V4L2_CID_VCENTER
+#define V4L2_CID_VCENTER V4L2_CID_VCENTER_DEPRECATED
+#endif
+
 GST_DEBUG_CATEGORY_EXTERN (v4l2_debug);
 #define GST_CAT_DEFAULT v4l2_debug
 
@@ -267,6 +275,8 @@ gst_v4l2_fill_lists (GstV4l2Object * v4l
       case V4L2_CID_VFLIP:
       case V4L2_CID_HCENTER:
       case V4L2_CID_VCENTER:
+      case V4L2_CID_PAN_RESET:
+      case V4L2_CID_TILT_RESET:
         /* not handled here, handled by VideoOrientation interface */
         control.id++;
         break;