summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Dröge <slomo@circular-chaos.org>2008-12-08 15:46:13 +0000
committerSebastian Dröge <slomo@circular-chaos.org>2008-12-08 15:46:13 +0000
commitd23484c483d1fc8f3d3020c7426a58c81144fec3 (patch)
treeb9311555c97e2281c5c94ea75a2176ac9235b0bf
parent204cd06fbee8807bcf33baf46f679196d60a107f (diff)
downloadgst-plugins-bad-d23484c483d1fc8f3d3020c7426a58c81144fec3.tar.gz
gst-plugins-bad-d23484c483d1fc8f3d3020c7426a58c81144fec3.tar.bz2
gst-plugins-bad-d23484c483d1fc8f3d3020c7426a58c81144fec3.zip
gst/mxf/mxfparse.c: All frame layout values except 0 are for interlaced video, not only 1 and 2.
Original commit message from CVS: * 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.
-rw-r--r--ChangeLog7
-rw-r--r--gst/mxf/mxfparse.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 75be8c39..3c62fe74 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
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),
(gst_mxf_demux_handle_primer_pack),
(gst_mxf_demux_handle_metadata_preface),
diff --git a/gst/mxf/mxfparse.c b/gst/mxf/mxfparse.c
index e2ff891e..334c7197 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)