diff --git a/ChangeLog b/ChangeLog
index 460d110984..9bb314bf92 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-28  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* ext/xvid/gstxvid.c: (gst_xvid_image_fill):
+	  Fix size calculation for I420/YV12. Fixes #348976.
+
 2006-07-27  Wim Taymans  <wim@fluendo.com>
 
 	* ext/gsm/gstgsmdec.c: (gst_gsmdec_init),
diff --git a/ext/xvid/gstxvid.c b/ext/xvid/gstxvid.c
index 96e11e6623..bc10d21906 100644
--- a/ext/xvid/gstxvid.c
+++ b/ext/xvid/gstxvid.c
@@ -320,7 +320,7 @@ gst_xvid_image_fill (xvid_image_t * im, void *ptr, gint csp,
 
       im->plane[2] = im->plane[1] + (stride * h2);
       im->stride[2] = stride;
-      size += 2 * (stride * height);
+      size += 2 * (stride * h2);
       break;
     case XVID_CSP_RGB555:
     case XVID_CSP_RGB565: