mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

Fix some 64 bits constants to be glib friendly

Browse source 
Original commit message from CVS:
Fix some 64 bits constants to be glib friendly
This commit is contained in:
Steve Lhomme 2004-07-24 21:16:15 +00:00
parent 3f95ab38b9
commit 6976ceb235
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,8 @@
2004-07-24 Steve Lhomme <steve.lhomme@free.fr>
* gst/matroska/ebml-write.c:
Fix some 64 bits constants to be glib friendly
2004-07-24 Steve Lhomme <steve.lhomme@free.fr> 2004-07-24 Steve Lhomme <steve.lhomme@free.fr>
* win32/gst.sln: * win32/gst.sln:
@ -5,7 +10,7 @@
* gst-libs/gst/gst-libs.vcproj: * gst-libs/gst/gst-libs.vcproj:
* gst/matroska/matroska.def: * gst/matroska/matroska.def:
* gst/matroska/matroska.vcproj: * 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 <otte@gnome.org> 2004-07-23 Benjamin Otte <otte@gnome.org>

11
gst/matroska/ebml-write.c
View file

@ -229,7 +229,7 @@ gst_ebml_write_element_size (GstBuffer * buf, guint64 size)
mask = 0x01; mask = 0x01;
bytes = 8; bytes = 8;
/* Now here's a real FIXME: we cannot read those yet! */ /* 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 */ /* write out, BE, with length size marker */
@ -321,7 +321,7 @@ gst_ebml_write_get_uint_size (guint64 num)
guint size = 1; guint size = 1;
/* get size */ /* get size */
while (num >= (1LLU << (size * 8)) && size < 8) { while (num >= (G_GINT64_CONSTANT (1) << (size * 8)) && size < 8) {
size++; size++;
} }
@ -464,9 +464,10 @@ gst_ebml_write_master_finish (GstEbmlWrite * ebml, guint64 startpos)
gst_ebml_write_seek (ebml, startpos); gst_ebml_write_seek (ebml, startpos);
buf = gst_ebml_write_element_new (ebml, 0); buf = gst_ebml_write_element_new (ebml, 0);
startpos = GUINT64_TO_BE ((1LLU << 56) | (pos - startpos - 8)); startpos =
memcpy (GST_BUFFER_DATA (buf) + GST_BUFFER_SIZE (buf), GUINT64_TO_BE ((G_GINT64_CONSTANT (1) << 56) | (pos - startpos - 8));
(guint8 *) & startpos, 8); memcpy (GST_BUFFER_DATA (buf) + GST_BUFFER_SIZE (buf), (guint8 *) & startpos,
8);
GST_BUFFER_SIZE (buf) += 8; GST_BUFFER_SIZE (buf) += 8;
gst_ebml_write_element_push (ebml, buf); gst_ebml_write_element_push (ebml, buf);
gst_ebml_write_seek (ebml, pos); gst_ebml_write_seek (ebml, pos);