summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEdgard Lima <edgard.lima@indt.org.br>2006-04-20 17:29:56 +0000
committerEdgard Lima <edgard.lima@indt.org.br>2006-04-20 17:29:56 +0000
commit13058bdf4c58921caa3e2635c371055c5d454def (patch)
tree0046f78e9fceb52d5de3c66690e404a74b199a54
parent67ac819e293a09aa54510c20b5b00d5f5f4bb2cf (diff)
downloadgst-plugins-bad-13058bdf4c58921caa3e2635c371055c5d454def.tar.gz
gst-plugins-bad-13058bdf4c58921caa3e2635c371055c5d454def.tar.bz2
gst-plugins-bad-13058bdf4c58921caa3e2635c371055c5d454def.zip
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.
-rw-r--r--ChangeLog5
-rw-r--r--sys/v4l2/gstv4l2src.c17
2 files changed, 18 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 29b76054..62980424 100644
--- 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 9a881d36..82fb8756 100644
--- 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
};