From 13058bdf4c58921caa3e2635c371055c5d454def Mon Sep 17 00:00:00 2001 From: Edgard Lima Date: Thu, 20 Apr 2006 17:29:56 +0000 Subject: 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. --- ChangeLog | 5 +++++ sys/v4l2/gstv4l2src.c | 17 +++++++++++++---- 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 + + * sys/v4l2/gstv4l2src.c: + Added a couple of ifdefs to make it compile with other kernels. + 2006-04-20 Wim Taymans Patch by: j^ 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 }; -- cgit v1.2.1