From f636fb8b343fb64818c4cce80f9b32a1fa90804e Mon Sep 17 00:00:00 2001 From: Sébastien Moutte Date: Wed, 9 May 2007 21:30:53 +0000 Subject: gst/level/gstlevel.c: Use guint8 * instead of gpointer then vs6 know the size of data pointed when moving the pointer. Original commit message from CVS: * gst/level/gstlevel.c: (gst_level_calculate_##TYPE), (gst_level_transform_ip): Use guint8 * instead of gpointer then vs6 know the size of data pointed when moving the pointer. * gst/rtp/gstrtph264pay.c: (gst_rtp_h264_pay_handle_buffer): Move instructions after variables declaration. * win32/vs6/autogen.dsp: * win32/vs6/libgstrtp.dsp: * win32/vs6/libgstrtsp.dsp: Update vs6 project files. --- gst/level/gstlevel.c | 6 +++--- gst/rtp/gstrtph264pay.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'gst') diff --git a/gst/level/gstlevel.c b/gst/level/gstlevel.c index 3edef456..91d787bf 100644 --- a/gst/level/gstlevel.c +++ b/gst/level/gstlevel.c @@ -313,7 +313,7 @@ gst_level_get_property (GObject * object, guint prop_id, #define DEFINE_INT_LEVEL_CALCULATOR(TYPE, RESOLUTION) \ static void inline \ -gst_level_calculate_##TYPE (gpointer data, guint num, guint channels, \ +gst_level_calculate_##TYPE (guint8 *data, guint num, guint channels, \ gdouble *NCS, gdouble *NPS) \ { \ TYPE * in = (TYPE *)data; \ @@ -344,7 +344,7 @@ DEFINE_INT_LEVEL_CALCULATOR (gint8, 7); #define DEFINE_FLOAT_LEVEL_CALCULATOR(TYPE) \ static void inline \ -gst_level_calculate_##TYPE (gpointer data, guint num, guint channels, \ +gst_level_calculate_##TYPE (guint8 *data, guint num, guint channels, \ gdouble *NCS, gdouble *NPS) \ { \ TYPE * in = (TYPE *)data; \ @@ -534,7 +534,7 @@ static GstFlowReturn gst_level_transform_ip (GstBaseTransform * trans, GstBuffer * in) { GstLevel *filter; - gpointer in_data; + guint8 *in_data; double CS = 0.0; guint num_frames = 0; guint num_int_samples = 0; /* number of interleaved samples diff --git a/gst/rtp/gstrtph264pay.c b/gst/rtp/gstrtph264pay.c index 5dd7f6fa..afb1e671 100644 --- a/gst/rtp/gstrtph264pay.c +++ b/gst/rtp/gstrtph264pay.c @@ -207,15 +207,15 @@ gst_rtp_h264_pay_handle_buffer (GstBaseRTPPayload * basepayload, ret = gst_basertppayload_push (basepayload, outbuf); return ret; } else { - GST_DEBUG_OBJECT (basepayload, - "NAL Unit DOES NOT fit in one packet datasize=%d mtu=%d", idxdata, mtu); - /* Fragmentation Units FU-A */ guint8 nalHeader; guint limitedSize; int ii = 0, start = 1, end = 0, first = 0; + GST_DEBUG_OBJECT (basepayload, + "NAL Unit DOES NOT fit in one packet datasize=%d mtu=%d", idxdata, mtu); + nalHeader = *pdata; pdata++; idxdata--; -- cgit