From e7a76badc5305dafebe4e5dc50f682394dd0d662 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
Date: Thu, 19 Apr 2012 09:50:25 +0200
Subject: [PATCH] v4l2src: Fix merge

---
 sys/v4l2/gstv4l2object.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/v4l2/gstv4l2object.c b/sys/v4l2/gstv4l2object.c
index 533b8b7e62..74d1e83cf0 100644
--- a/sys/v4l2/gstv4l2object.c
+++ b/sys/v4l2/gstv4l2object.c
@@ -1202,7 +1202,7 @@ gst_v4l2_object_v4l2fourcc_to_structure (guint32 fourcc)
       /* FIXME: get correct fourccs here */
       break;
     case V4L2_PIX_FMT_H264:    /* H.264 */
-      structure = gst_structure_new ("video/x-h264", NULL);
+      structure = gst_structure_new_empty ("video/x-h264");
       break;
     case V4L2_PIX_FMT_RGB332:
     case V4L2_PIX_FMT_RGB555X: