From f42029d79ffe2ff83bc8f9776c70870a67434435 Mon Sep 17 00:00:00 2001 From: Jens Granseuer Date: Mon, 23 Jan 2006 09:59:03 +0000 Subject: [PATCH] C89 fixes: declare variables at the beginning of a block and Original commit message from CVS: * ext/libpng/gstpngenc.c: (gst_pngenc_chain): * gst/avi/gstavidemux.c: (gst_avi_demux_invert): * gst/rtp/gstrtpmp4vdepay.c: (gst_rtp_mp4v_depay_setcaps): * gst/rtsp/sdpmessage.h: * gst/udp/gstdynudpsink.c: (gst_dynudpsink_render): * gst/udp/gstmultiudpsink.c: (gst_multiudpsink_get_stats): C89 fixes: declare variables at the beginning of a block and make gcc-2.9x happy (#328264; patch by: Jens Granseuer ). --- ChangeLog | 12 ++++++++++++ ext/libpng/gstpngenc.c | 4 +++- gst/avi/gstavidemux.c | 2 +- gst/rtp/gstrtpmp4vdepay.c | 3 +-- gst/rtsp/sdpmessage.h | 2 +- gst/udp/gstdynudpsink.c | 4 ++-- gst/udp/gstmultiudpsink.c | 4 ++-- 7 files changed, 22 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 78ec862..44a8654 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2006-01-23 Tim-Philipp Müller + + * ext/libpng/gstpngenc.c: (gst_pngenc_chain): + * gst/avi/gstavidemux.c: (gst_avi_demux_invert): + * gst/rtp/gstrtpmp4vdepay.c: (gst_rtp_mp4v_depay_setcaps): + * gst/rtsp/sdpmessage.h: + * gst/udp/gstdynudpsink.c: (gst_dynudpsink_render): + * gst/udp/gstmultiudpsink.c: (gst_multiudpsink_get_stats): + C89 fixes: declare variables at the beginning of a block and + make gcc-2.9x happy (#328264; patch by: Jens Granseuer + ). + 2006-01-23 Jan Schmidt * gst/id3demux/id3tags.c: (id3demux_read_id3v2_tag): diff --git a/ext/libpng/gstpngenc.c b/ext/libpng/gstpngenc.c index eee5132..190ffbb 100644 --- a/ext/libpng/gstpngenc.c +++ b/ext/libpng/gstpngenc.c @@ -323,9 +323,11 @@ gst_pngenc_chain (GstPad * pad, GstBuffer * buf) goto done; if (pngenc->snapshot) { + GstEvent *event; + GST_DEBUG_OBJECT (pngenc, "snapshot mode, sending EOS"); /* send EOS event, since a frame has been pushed out */ - GstEvent *event = gst_event_new_eos (); + event = gst_event_new_eos (); ret = gst_pad_push_event (pngenc->srcpad, event); diff --git a/gst/avi/gstavidemux.c b/gst/avi/gstavidemux.c index 7232fd1..d605552 100644 --- a/gst/avi/gstavidemux.c +++ b/gst/avi/gstavidemux.c @@ -2219,10 +2219,10 @@ swap_line (guint8 * d1, guint8 * d2, guint8 * tmp, gint bytes) static GstBuffer * gst_avi_demux_invert (avi_stream_context * stream, GstBuffer * buf) { - buf = gst_buffer_make_writable (buf); gint y, h = stream->strf.vids->height, w = stream->strf.vids->width; guint8 *tmp = NULL; + buf = gst_buffer_make_writable (buf); if (GST_BUFFER_SIZE (buf) < (w * h)) { GST_WARNING ("Buffer is smaller than reported Width x Height"); return buf; diff --git a/gst/rtp/gstrtpmp4vdepay.c b/gst/rtp/gstrtpmp4vdepay.c index 551049b..3582a30 100644 --- a/gst/rtp/gstrtpmp4vdepay.c +++ b/gst/rtp/gstrtpmp4vdepay.c @@ -132,13 +132,12 @@ gst_rtp_mp4v_depay_setcaps (GstBaseRTPDepayload * depayload, GstCaps * caps) GstRtpMP4VDepay *rtpmp4vdepay; GstCaps *srccaps; const gchar *str; + gint clock_rate = 90000; /* default */ rtpmp4vdepay = GST_RTP_MP4V_DEPAY (depayload); structure = gst_caps_get_structure (caps, 0); - gint clock_rate = 90000; // default - if (gst_structure_has_field (structure, "clock-rate")) { gst_structure_get_int (structure, "clock-rate", &clock_rate); } diff --git a/gst/rtsp/sdpmessage.h b/gst/rtsp/sdpmessage.h index e50a9ee..22c5b1d 100644 --- a/gst/rtsp/sdpmessage.h +++ b/gst/rtsp/sdpmessage.h @@ -52,7 +52,7 @@ typedef struct { gchar *start; gchar *stop; gint n_repeat; - gchar *repeat[]; + gchar **repeat; } SDPTime; typedef struct { diff --git a/gst/udp/gstdynudpsink.c b/gst/udp/gstdynudpsink.c index e7be3b2..2668016 100644 --- a/gst/udp/gstdynudpsink.c +++ b/gst/udp/gstdynudpsink.c @@ -187,6 +187,8 @@ gst_dynudpsink_render (GstBaseSink * bsink, GstBuffer * buffer) guint8 *data; GstNetBuffer *netbuf; struct sockaddr_in theiraddr; + guint16 destport; + guint32 destaddr; memset (&theiraddr, 0, sizeof (theiraddr)); @@ -203,8 +205,6 @@ gst_dynudpsink_render (GstBaseSink * bsink, GstBuffer * buffer) data = GST_BUFFER_DATA (netbuf); GST_DEBUG ("about to send %d bytes", size); - guint16 destport; - guint32 destaddr; // let's get the address from the netbuffer gst_netaddress_get_ip4_address (&netbuf->to, &destaddr, &destport); diff --git a/gst/udp/gstmultiudpsink.c b/gst/udp/gstmultiudpsink.c index ed9be9e..bcc8112 100644 --- a/gst/udp/gstmultiudpsink.c +++ b/gst/udp/gstmultiudpsink.c @@ -462,10 +462,10 @@ gst_multiudpsink_get_stats (GstMultiUDPSink * sink, const gchar * host, find = g_list_find_custom (sink->clients, &udpclient, (GCompareFunc) client_compare); if (find) { - client = (GstUDPClient *) find->data; - GValue value = { 0 }; + client = (GstUDPClient *) find->data; + /* Result is a value array of (bytes_sent, packets_sent, * connect_time, disconnect_time), all as uint64 */ result = g_value_array_new (4); -- 2.7.4