From 68645e1e9bc01b4f3dc41625a80adbdee0fc9b16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Tue, 23 Apr 2019 18:00:59 +0300 Subject: [PATCH] bitwriter: Fix inclusion of header in C++ code ../subprojects/gstreamer/libs/gst/base/gstbitwriter.h: In function 'gboolean _gst_bit_writer_check_remaining(GstBitWriter*, guint32)': ../subprojects/gstreamer/libs/gst/base/gstbitwriter.h:161:31: error: invalid conversion from 'gpointer' {aka 'void*'} to 'guint8*' {aka 'unsigned char*'} [-fpermissive] bitwriter->data = g_realloc (bitwriter->data, (new_bit_size >> 3)); ~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- libs/gst/base/gstbitwriter.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/gst/base/gstbitwriter.h b/libs/gst/base/gstbitwriter.h index 5cffbba775..8a860e8e08 100644 --- a/libs/gst/base/gstbitwriter.h +++ b/libs/gst/base/gstbitwriter.h @@ -160,7 +160,7 @@ _gst_bit_writer_check_remaining (GstBitWriter * bitwriter, guint32 bits) g_assert (new_bit_size && ((new_bit_size & __GST_BITS_WRITER_ALIGNMENT_MASK) == 0)); clear_pos = ((bitwriter->bit_size + 7) >> 3); - bitwriter->data = g_realloc (bitwriter->data, (new_bit_size >> 3)); + bitwriter->data = (guint8 *) g_realloc (bitwriter->data, (new_bit_size >> 3)); memset (bitwriter->data + clear_pos, 0, (new_bit_size >> 3) - clear_pos); bitwriter->bit_capacity = new_bit_size; return TRUE;