From 85d4dde9d17aedd8c6a9d88f8b205afe01575633 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Thu, 19 Apr 2012 12:38:58 +0200 Subject: [PATCH] v4l2: fix compilation on older v4l2 Fix compilation on systems where the H264 format is not defined. --- sys/v4l2/gstv4l2object.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sys/v4l2/gstv4l2object.c b/sys/v4l2/gstv4l2object.c index 0c94494..1e1f9c9 100644 --- a/sys/v4l2/gstv4l2object.c +++ b/sys/v4l2/gstv4l2object.c @@ -880,7 +880,9 @@ static const GstV4L2FormatDesc gst_v4l2_formats[] = { {V4L2_PIX_FMT_DV, TRUE}, {V4L2_PIX_FMT_MPEG, FALSE}, +#ifdef V4L2_PIX_FMT_H264 {V4L2_PIX_FMT_H264, TRUE}, +#endif /* Vendor-specific formats */ {V4L2_PIX_FMT_WNVA, TRUE}, @@ -1201,9 +1203,11 @@ gst_v4l2_object_v4l2fourcc_to_structure (guint32 fourcc) case V4L2_PIX_FMT_HI240: /* 8 8-bit color */ /* FIXME: get correct fourccs here */ break; +#ifdef V4L2_PIX_FMT_H264 case V4L2_PIX_FMT_H264: /* H.264 */ structure = gst_structure_new_empty ("video/x-h264"); break; +#endif case V4L2_PIX_FMT_RGB332: case V4L2_PIX_FMT_RGB555X: case V4L2_PIX_FMT_RGB565X: @@ -1476,8 +1480,10 @@ gst_v4l2_object_get_caps_info (GstV4l2Object * v4l2object, GstCaps * caps, fourcc = V4L2_PIX_FMT_DV; } else if (g_str_equal (mimetype, "image/jpeg")) { fourcc = V4L2_PIX_FMT_JPEG; +#ifdef V4L2_PIX_FMT_H264 } else if (g_str_equal (mimetype, "video/x-h264")) { fourcc = V4L2_PIX_FMT_H264; +#endif #ifdef V4L2_PIX_FMT_SBGGR8 } else if (g_str_equal (mimetype, "video/x-bayer")) { fourcc = V4L2_PIX_FMT_SBGGR8; -- 2.7.4