diff --git a/ChangeLog b/ChangeLog
index ff74c50dc2..de6c6e015f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-07-17  Tim-Philipp Müller  <tim.muller at collabora co uk>
+
+	Patch by: Benoit Fouet <benoit.fouet purplelabs com>
+
+	* sys/v4l2/gstv4l2src.c: (gst_v4l2src_negotiate):
+	  Avoid compiler warning by initialising variable to NULL (#543259).
+
 2008-07-14  Sebastian Dröge  <slomo@circular-chaos.org>
 
 	* gst/debug/gsttaginject.c: (gst_tag_inject_start):
diff --git a/sys/v4l2/gstv4l2src.c b/sys/v4l2/gstv4l2src.c
index a6919b97e9..ce4b22376f 100644
--- a/sys/v4l2/gstv4l2src.c
+++ b/sys/v4l2/gstv4l2src.c
@@ -476,8 +476,7 @@ gst_v4l2src_negotiate (GstBaseSrc * basesrc)
   peercaps = gst_pad_peer_get_caps (GST_BASE_SRC_PAD (basesrc));
   GST_DEBUG_OBJECT (basesrc, "caps of peer: %" GST_PTR_FORMAT, peercaps);
   if (peercaps && !gst_caps_is_any (peercaps)) {
-    GstCaps *icaps;
-
+    GstCaps *icaps = NULL;
     int i;
 
     /* Prefer the first caps we are compatible with that the peer proposed */