[0.11] gst-plugins-good: v4l2: Use #ifdefs for V4L2_PIX_FMT_PJPG

[Wim Taymans]

Module: gst-plugins-good
Branch: 0.11
Commit: 910a6f0c96bc7c0fc4410be0ae8c9fa72bef9f9c
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-good/commit/?id=910a6f0c96bc7c0fc4410be0ae8c9fa72bef9f9c

Author: David Schleef <ds at schleef.org>
Date:   Fri Mar  4 18:37:38 2011 -0800

v4l2: Use #ifdefs for V4L2_PIX_FMT_PJPG

It's only recently added to kernel headers.

---

 sys/v4l2/gstv4l2object.c |   20 ++++++++++++++++----
 1 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/sys/v4l2/gstv4l2object.c b/sys/v4l2/gstv4l2object.c
index 6cf9036..5296197 100644
--- a/sys/v4l2/gstv4l2object.c
+++ b/sys/v4l2/gstv4l2object.c
@@ -774,7 +774,9 @@ static const GstV4L2FormatDesc gst_v4l2_formats[] = {
   /* compressed formats */
   {V4L2_PIX_FMT_MJPEG, TRUE},
   {V4L2_PIX_FMT_JPEG, TRUE},
+#ifdef V4L2_PIX_FMT_PJPG
   {V4L2_PIX_FMT_PJPG, TRUE},
+#endif
   {V4L2_PIX_FMT_DV, TRUE},
   {V4L2_PIX_FMT_MPEG, FALSE},
 
@@ -815,10 +817,16 @@ gst_v4l2_object_get_format_from_fourcc (GstV4l2Object * v4l2object,
       return fmt;
     /* special case for jpeg */
     if (fmt->pixelformat == V4L2_PIX_FMT_MJPEG ||
-        fmt->pixelformat == V4L2_PIX_FMT_JPEG ||
-        fmt->pixelformat == V4L2_PIX_FMT_PJPG) {
-      if (fourcc == V4L2_PIX_FMT_JPEG
-          || fourcc == V4L2_PIX_FMT_MJPEG || fourcc == V4L2_PIX_FMT_PJPG) {
+        fmt->pixelformat == V4L2_PIX_FMT_JPEG
+#ifdef V4L2_PIX_FMT_PJPG
+        || fmt->pixelformat == V4L2_PIX_FMT_PJPG
+#endif
+        ) {
+      if (fourcc == V4L2_PIX_FMT_JPEG || fourcc == V4L2_PIX_FMT_MJPEG
+#ifdef V4L2_PIX_FMT_PJPG
+          || fourcc == V4L2_PIX_FMT_PJPG
+#endif
+          ) {
         return fmt;
       }
     }
@@ -858,9 +866,11 @@ gst_v4l2_object_format_get_rank (const struct v4l2_fmtdesc *fmt)
 
   switch (fourcc) {
     case V4L2_PIX_FMT_MJPEG:
+#ifdef V4L2_PIX_FMT_PJPG
     case V4L2_PIX_FMT_PJPG:
       rank = JPEG_BASE_RANK;
       break;
+#endif
     case V4L2_PIX_FMT_JPEG:
       rank = JPEG_BASE_RANK + 1;
       break;
@@ -1077,7 +1087,9 @@ gst_v4l2_object_v4l2fourcc_to_structure (guint32 fourcc)
 
   switch (fourcc) {
     case V4L2_PIX_FMT_MJPEG:   /* Motion-JPEG */
+#ifdef V4L2_PIX_FMT_PJPG
     case V4L2_PIX_FMT_PJPG:    /* Progressive-JPEG */
+#endif
     case V4L2_PIX_FMT_JPEG:    /* JFIF JPEG */
       structure = gst_structure_new ("image/jpeg", NULL);
       break;