diff --git a/ChangeLog b/ChangeLog
index cd654ce009..f49eab0947 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-06-13  Wim Taymans  <wim@fluendo.com>
+
+	* gst/rtp/gstrtph264depay.c: (gst_rtp_h264_depay_setcaps):
+	Make sure we allocate enough memory for the codec_data.
+	Fixes #447210.
+
 2007-06-12  Sebastien Moutte  <sebastien@moutte.net>
 
 	* win32/MANIFEST:
diff --git a/gst/rtp/gstrtph264depay.c b/gst/rtp/gstrtph264depay.c
index 1b1fffbdea..164ef56c63 100644
--- a/gst/rtp/gstrtph264depay.c
+++ b/gst/rtp/gstrtph264depay.c
@@ -237,10 +237,12 @@ gst_rtp_h264_depay_setcaps (GstBaseRTPDepayload * depayload, GstCaps * caps)
     ps = gst_structure_get_string (structure, "sprop-parameter-sets");
     params = g_strsplit (ps, ",", 0);
 
-    /* count total number of bytes in base64 */
+    /* count total number of bytes in base64. Also include the sync bytes in
+     * front of the params. */
     len = 0;
     for (i = 0; params[i]; i++) {
       len += strlen (params[i]);
+      len += sizeof (sync_bytes);
     }
     /* we seriously overshoot the length, but it's fine. */
     codec_data = gst_buffer_new_and_alloc (len);