Added a couple of ifdefs to make it compile with other kernels.

Original commit message from CVS:
Added a couple of ifdefs to make it compile with other kernels.

diff --git a/ChangeLog b/ChangeLog
index 29b760544ccf1a1ee5956898a957ebc53c15f327..629804243b6b8b46b5c2bd6b527c57b6262581e4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-20  Edgard Lima  <edgard.lima@indt.org.br>
+
+       * sys/v4l2/gstv4l2src.c:
+       Added a couple of ifdefs to make it compile with other kernels.
+       
 2006-04-20  Wim Taymans  <wim@fluendo.com>
 
        Patch by: j^ <j at bootlab dot org>

diff --git a/sys/v4l2/gstv4l2src.c b/sys/v4l2/gstv4l2src.c
index 9a881d362a955750ebd0677a01eb2a56c2f38b2c..82fb875604fd1afacc5da912e45bb4131a22770f 100644 (file)
--- a/sys/v4l2/gstv4l2src.c
+++ b/sys/v4l2/gstv4l2src.c
@@ -102,7 +102,9 @@ static guint32 gst_v4l2_formats[] = {
   V4L2_PIX_FMT_HI240,
 
   /* see http://www.siliconimaging.com/RGB%20Bayer.htm */
+#ifdef V4L2_PIX_FMT_SBGGR8
   V4L2_PIX_FMT_SBGGR8,
+#endif
 
   /* compressed formats */
   V4L2_PIX_FMT_MJPEG,
@@ -111,10 +113,17 @@ static guint32 gst_v4l2_formats[] = {
   V4L2_PIX_FMT_MPEG,
 
   /*  Vendor-specific formats   */
-  V4L2_PIX_FMT_WNVA
-      /* V4L2_PIX_FMT_SN9C10X FIX */
-      /* V4L2_PIX_FMT_PWC1 FIX */
-      /* V4L2_PIX_FMT_PWC2 FIX */
+  V4L2_PIX_FMT_WNVA,
+
+#ifdef V4L2_PIX_FMT_SN9C10X
+  V4L2_PIX_FMT_SN9C10X,
+#endif
+#ifdef V4L2_PIX_FMT_PWC1
+  V4L2_PIX_FMT_PWC1,
+#endif
+#ifdef V4L2_PIX_FMT_PWC2
+  V4L2_PIX_FMT_PWC2,
+#endif
 };