From 6976ceb2358292e82a6cfae7450e800ccef8f8a9 Mon Sep 17 00:00:00 2001 From: Steve Lhomme Date: Sat, 24 Jul 2004 21:16:15 +0000 Subject: [PATCH] Fix some 64 bits constants to be glib friendly Original commit message from CVS: Fix some 64 bits constants to be glib friendly --- ChangeLog | 7 ++++++- gst/matroska/ebml-write.c | 11 ++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index d2dab97..f1a5206 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,11 +1,16 @@ 2004-07-24 Steve Lhomme + * gst/matroska/ebml-write.c: + Fix some 64 bits constants to be glib friendly + +2004-07-24 Steve Lhomme + * win32/gst.sln: * gst-libs/gst/gst-libs.def: * gst-libs/gst/gst-libs.vcproj: * gst/matroska/matroska.def: * gst/matroska/matroska.vcproj: - Add the preliminary canvas to build plugins on Win32 + Add the preliminary canvas to build plugins on Win32 2004-07-23 Benjamin Otte diff --git a/gst/matroska/ebml-write.c b/gst/matroska/ebml-write.c index 302d489..e59c5a4 100644 --- a/gst/matroska/ebml-write.c +++ b/gst/matroska/ebml-write.c @@ -229,7 +229,7 @@ gst_ebml_write_element_size (GstBuffer * buf, guint64 size) mask = 0x01; bytes = 8; /* Now here's a real FIXME: we cannot read those yet! */ - size = 0x00ffffffffffffffLLU; + size = G_GINT64_CONSTANT (0x00ffffffffffffff); } /* write out, BE, with length size marker */ @@ -321,7 +321,7 @@ gst_ebml_write_get_uint_size (guint64 num) guint size = 1; /* get size */ - while (num >= (1LLU << (size * 8)) && size < 8) { + while (num >= (G_GINT64_CONSTANT (1) << (size * 8)) && size < 8) { size++; } @@ -464,9 +464,10 @@ gst_ebml_write_master_finish (GstEbmlWrite * ebml, guint64 startpos) gst_ebml_write_seek (ebml, startpos); buf = gst_ebml_write_element_new (ebml, 0); - startpos = GUINT64_TO_BE ((1LLU << 56) | (pos - startpos - 8)); - memcpy (GST_BUFFER_DATA (buf) + GST_BUFFER_SIZE (buf), - (guint8 *) & startpos, 8); + startpos = + GUINT64_TO_BE ((G_GINT64_CONSTANT (1) << 56) | (pos - startpos - 8)); + memcpy (GST_BUFFER_DATA (buf) + GST_BUFFER_SIZE (buf), (guint8 *) & startpos, + 8); GST_BUFFER_SIZE (buf) += 8; gst_ebml_write_element_push (ebml, buf); gst_ebml_write_seek (ebml, pos); -- 2.7.4