diff options
author | Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk> | 2008-12-01 16:37:45 +0000 |
---|---|---|
committer | Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk> | 2008-12-01 16:37:45 +0000 |
commit | 86638af6cb3d38f443c4ad0c8dec87c66fd1243d (patch) | |
tree | cd2a534de89c824509b3ce4228409117f67d5304 | |
parent | 0818d7b41d94bfe28ad7c02c8345d6511df88673 (diff) | |
download | gst-plugins-bad-86638af6cb3d38f443c4ad0c8dec87c66fd1243d.tar.gz gst-plugins-bad-86638af6cb3d38f443c4ad0c8dec87c66fd1243d.tar.bz2 gst-plugins-bad-86638af6cb3d38f443c4ad0c8dec87c66fd1243d.zip |
gst/qtmux/atoms.c: Fix mj2 sample description metadata construction.
Original commit message from CVS:
* gst/qtmux/atoms.c: (build_jp2h_extension):
Fix mj2 sample description metadata construction.
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | gst/qtmux/atoms.c | 6 |
2 files changed, 8 insertions, 3 deletions
@@ -1,3 +1,8 @@ +2008-12-01 Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk> + + * gst/qtmux/atoms.c: (build_jp2h_extension): + Fix mj2 sample description metadata construction. + 2008-12-01 Sebastian Dröge <sebastian.droege@collabora.co.uk> * gst/mxf/mxfjpeg2000.c: (mxf_jpeg2000_create_caps): diff --git a/gst/qtmux/atoms.c b/gst/qtmux/atoms.c index 636f21c2..c0f1f195 100644 --- a/gst/qtmux/atoms.c +++ b/gst/qtmux/atoms.c @@ -2895,7 +2895,7 @@ build_jp2h_extension (AtomTRAK * trak, gint width, gint height, guint32 fourcc) } else return FALSE; - buf = gst_buffer_new_and_alloc (22 + 12); + buf = gst_buffer_new_and_alloc (22 + 15); data = GST_BUFFER_DATA (buf); /* ihdr = image header box */ @@ -2917,7 +2917,7 @@ build_jp2h_extension (AtomTRAK * trak, gint width, gint height, guint32 fourcc) /* colour specification box */ data += 22; - GST_WRITE_UINT32_BE (data, 12); + GST_WRITE_UINT32_BE (data, 15); GST_WRITE_UINT32_LE (data + 4, GST_MAKE_FOURCC ('c', 'o', 'l', 'r')); /* specification method: enumerated */ GST_WRITE_UINT8 (data + 8, 0x1); @@ -2926,7 +2926,7 @@ build_jp2h_extension (AtomTRAK * trak, gint width, gint height, guint32 fourcc) /* approximation; reserved */ GST_WRITE_UINT8 (data + 10, 0x0); /* enumerated colourspace */ - GST_WRITE_UINT8 (data + 11, cenum); + GST_WRITE_UINT32_BE (data + 11, cenum); atom_data = atom_data_new_from_gst_buffer (FOURCC_jp2h, buf); gst_buffer_unref (buf); |