summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWim Taymans <wim.taymans@gmail.com>2008-10-31 10:08:50 +0000
committerWim Taymans <wim.taymans@gmail.com>2008-10-31 10:08:50 +0000
commit46fe1e3fa07db49c121cee13e08d6472ba83e12b (patch)
tree05a30922bc1a8c4c93c6e172333c8323ccf3009f
parent66c804b41ca0ac876ba436f0fc0780775d8bc737 (diff)
sys/v4l2/v4l2src_calls.c: Guard more uncommon formats with ifdefs so that we can compile on older versions.
Original commit message from CVS: * sys/v4l2/v4l2src_calls.c: (gst_v4l2src_format_get_rank): Guard more uncommon formats with ifdefs so that we can compile on older versions.
-rw-r--r--ChangeLog6
-rw-r--r--sys/v4l2/v4l2src_calls.c8
2 files changed, 14 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index fa1c7ce8..beaa3cd8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2008-10-31 Wim Taymans <wim.taymans@collabora.co.uk>
+ * sys/v4l2/v4l2src_calls.c: (gst_v4l2src_format_get_rank):
+ Guard more uncommon formats with ifdefs so that we can compile on older
+ versions.
+
+2008-10-31 Wim Taymans <wim.taymans@collabora.co.uk>
+
Patch by: Nick Haddad <nick at haddads dot net>
* gst/avi/gstavidemux.c: (gst_avi_demux_is_uncompressed),
diff --git a/sys/v4l2/v4l2src_calls.c b/sys/v4l2/v4l2src_calls.c
index b556cba7..3643e5bb 100644
--- a/sys/v4l2/v4l2src_calls.c
+++ b/sys/v4l2/v4l2src_calls.c
@@ -469,16 +469,24 @@ gst_v4l2src_format_get_rank (guint32 fourcc)
case V4L2_PIX_FMT_WNVA: /* Winnov hw compres */
return 0;
+#ifdef V4L2_PIX_FMT_SBGGR8
case V4L2_PIX_FMT_SBGGR8:
return BAYER_BASE_RANK;
+#endif
+#ifdef V4L2_PIX_FMT_SN9C10X
case V4L2_PIX_FMT_SN9C10X:
return S910_BASE_RANK;
+#endif
+#ifdef V4L2_PIX_FMT_PWC1
case V4L2_PIX_FMT_PWC1:
return PWC_BASE_RANK;
+#endif
+#ifdef V4L2_PIX_FMT_PWC2
case V4L2_PIX_FMT_PWC2:
return PWC_BASE_RANK;
+#endif
default:
break;