diff --git a/ChangeLog b/ChangeLog
index 75be8c3943..3c62fe741d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-12-08  Sebastian Dröge  <sebastian.droege@collabora.co.uk>
+
+	* gst/mxf/mxfparse.c:
+	(mxf_metadata_generic_picture_essence_descriptor_set_caps):
+	All frame layout values except 0 are for interlaced video,
+	not only 1 and 2.
+
 2008-12-08  Sebastian Dröge  <sebastian.droege@collabora.co.uk>
 
 	* gst/mxf/mxfdemux.c: (gst_mxf_demux_reset_metadata),
diff --git a/gst/mxf/mxfparse.c b/gst/mxf/mxfparse.c
index e2ff891ef6..334c71978a 100644
--- a/gst/mxf/mxfparse.c
+++ b/gst/mxf/mxfparse.c
@@ -2629,7 +2629,7 @@ void mxf_metadata_generic_picture_essence_descriptor_set_caps
    *
    * See SMPTE 377M E2.2 and E1.2
    */
-  if (descriptor->frame_layout == 1 || descriptor->frame_layout == 2)
+  if (descriptor->frame_layout != 0)
     height *= 2;
 
   if (width == 0 || height == 0)