From bf2b14f8608413fb3cd41215fa5c8fd46d4d597f Mon Sep 17 00:00:00 2001 From: Marc Plano-Lesay Date: Sat, 9 Apr 2011 19:15:23 +0200 Subject: [PATCH] fix unused-but-set-variable warnings with gcc 4.6 https://bugzilla.gnome.org/show_bug.cgi?id=647294 --- gst/playback/gstplaybasebin.c | 8 ++------ gst/subparse/tmplayerparse.c | 2 -- gst/tcp/gstmultifdsink.c | 12 +++++------- gst/videoscale/vs_image.c | 9 --------- 4 files changed, 7 insertions(+), 24 deletions(-) diff --git a/gst/playback/gstplaybasebin.c b/gst/playback/gstplaybasebin.c index 530d4011dc..847e12ff71 100644 --- a/gst/playback/gstplaybasebin.c +++ b/gst/playback/gstplaybasebin.c @@ -425,7 +425,6 @@ group_commit (GstPlayBaseBin * play_base_bin, gboolean fatal, gboolean subtitle) { GstPlayBaseGroup *group; gboolean had_active_group; - gboolean res; GROUP_LOCK (play_base_bin); group = play_base_bin->building_group; @@ -486,8 +485,7 @@ group_commit (GstPlayBaseBin * play_base_bin, gboolean fatal, gboolean subtitle) setup_substreams (play_base_bin); GST_DEBUG_OBJECT (play_base_bin, "Emitting signal"); - res = - GST_PLAY_BASE_BIN_GET_CLASS (play_base_bin)->setup_output_pads + GST_PLAY_BASE_BIN_GET_CLASS (play_base_bin)->setup_output_pads (play_base_bin, group); GST_DEBUG_OBJECT (play_base_bin, "done"); @@ -1167,7 +1165,6 @@ probe_triggered (GstPad * pad, GstEvent * event, gpointer user_data) GstPlayBaseGroup *group; GstPlayBaseBin *play_base_bin; GstStreamInfo *info; - gboolean res; GstEventType type; type = GST_EVENT_TYPE (event); @@ -1231,8 +1228,7 @@ probe_triggered (GstPad * pad, GstEvent * event, gpointer user_data) setup_substreams (play_base_bin); GST_DEBUG ("switching to next group %p - emitting signal", group); /* and signal the new group */ - res = - GST_PLAY_BASE_BIN_GET_CLASS (play_base_bin)->setup_output_pads + GST_PLAY_BASE_BIN_GET_CLASS (play_base_bin)->setup_output_pads (play_base_bin, group); GROUP_UNLOCK (play_base_bin); diff --git a/gst/subparse/tmplayerparse.c b/gst/subparse/tmplayerparse.c index 8f48c6e9d4..3937de6f3a 100644 --- a/gst/subparse/tmplayerparse.c +++ b/gst/subparse/tmplayerparse.c @@ -84,7 +84,6 @@ tmplayer_parse_line (ParserState * state, const gchar * line, guint line_num) { GstClockTime ts = GST_CLOCK_TIME_NONE; const gchar *text_start = NULL; - gboolean multiline = FALSE; gchar *ret = NULL; gchar divc = '\0'; guint h, m, s, l = 1; @@ -94,7 +93,6 @@ tmplayer_parse_line (ParserState * state, const gchar * line, guint line_num) GST_LOG ("multiline format %u %u %u %u", h, m, s, l); ts = GST_SECOND * ((((h * 60) + m) * 60) + s); text_start = strchr (line, '='); - multiline = TRUE; } else if (sscanf (line, "%u:%02u:%02u%c", &h, &m, &s, &divc) == 4 && (divc == '=' || divc == ':')) { GST_LOG ("single line format %u %u %u %u %c", h, m, s, l, divc); diff --git a/gst/tcp/gstmultifdsink.c b/gst/tcp/gstmultifdsink.c index 00cff05ec8..4e091e3be4 100644 --- a/gst/tcp/gstmultifdsink.c +++ b/gst/tcp/gstmultifdsink.c @@ -821,7 +821,7 @@ gst_multi_fd_sink_add_full (GstMultiFdSink * sink, int fd, GstTCPClient *client; GList *clink; GTimeVal now; - gint flags, res; + gint flags; struct stat statbuf; GST_DEBUG_OBJECT (sink, "[fd %5d] adding client, sync_method %d, " @@ -876,7 +876,7 @@ gst_multi_fd_sink_add_full (GstMultiFdSink * sink, int fd, sink->clients_cookie++; /* set the socket to non blocking */ - res = fcntl (fd, F_SETFL, O_NONBLOCK); + fcntl (fd, F_SETFL, O_NONBLOCK); /* we always read from a client */ gst_poll_add_fd (sink->fdset, &client->fd); @@ -888,7 +888,7 @@ gst_multi_fd_sink_add_full (GstMultiFdSink * sink, int fd, } } /* figure out the mode, can't use send() for non sockets */ - res = fstat (fd, &statbuf); + fstat (fd, &statbuf); if (S_ISSOCK (statbuf.st_mode)) { client->is_socket = TRUE; setup_dscp_client (sink, client); @@ -1865,7 +1865,6 @@ gst_multi_fd_sink_new_client (GstMultiFdSink * sink, GstTCPClient * client) } case GST_SYNC_METHOD_BURST_KEYFRAME: { - gboolean ok; gint min_idx, max_idx; gint next_syncframe, prev_syncframe; @@ -1877,7 +1876,7 @@ gst_multi_fd_sink_new_client (GstMultiFdSink * sink, GstTCPClient * client) * NEXT_KEYFRAME. */ /* gather burst limits */ - ok = count_burst_unit (sink, &min_idx, client->burst_min_unit, + count_burst_unit (sink, &min_idx, client->burst_min_unit, client->burst_min_value, &max_idx, client->burst_max_unit, client->burst_max_value); @@ -1914,7 +1913,6 @@ gst_multi_fd_sink_new_client (GstMultiFdSink * sink, GstTCPClient * client) } case GST_SYNC_METHOD_BURST_WITH_KEYFRAME: { - gboolean ok; gint min_idx, max_idx; gint next_syncframe; @@ -1925,7 +1923,7 @@ gst_multi_fd_sink_new_client (GstMultiFdSink * sink, GstTCPClient * client) * amount of data up 'till min. */ /* gather enough data to burst */ - ok = count_burst_unit (sink, &min_idx, client->burst_min_unit, + count_burst_unit (sink, &min_idx, client->burst_min_unit, client->burst_min_value, &max_idx, client->burst_max_unit, client->burst_max_value); diff --git a/gst/videoscale/vs_image.c b/gst/videoscale/vs_image.c index bff8ac767c..691914453f 100644 --- a/gst/videoscale/vs_image.c +++ b/gst/videoscale/vs_image.c @@ -85,7 +85,6 @@ vs_image_scale_linear_RGBA (const VSImage * dest, const VSImage * src, int y_increment; int x_increment; int y1; - int y2; int i; int j; int x; @@ -106,7 +105,6 @@ vs_image_scale_linear_RGBA (const VSImage * dest, const VSImage * src, #define LINE(x) ((tmpbuf) + (dest_size)*((x)&1)) acc = 0; - y2 = -1; gst_videoscale_orc_resample_bilinear_u32 (LINE (0), src->pixels, 0, x_increment, dest->width); y1 = 0; @@ -574,7 +572,6 @@ vs_image_scale_linear_Y (const VSImage * dest, const VSImage * src, int j; int x; int dest_size; - int xacc; if (dest->height == 1) y_increment = 0; @@ -592,7 +589,6 @@ vs_image_scale_linear_Y (const VSImage * dest, const VSImage * src, tmp2 = tmpbuf + dest_size; acc = 0; - xacc = 0; y2 = -1; gst_videoscale_orc_resample_bilinear_u8 (tmp1, src->pixels, 0, x_increment, dest->width); @@ -607,7 +603,6 @@ vs_image_scale_linear_Y (const VSImage * dest, const VSImage * src, } else if (j == y2) { memcpy (dest->pixels + i * dest->stride, tmp2, dest_size); } else { - xacc = 0; gst_videoscale_orc_resample_bilinear_u8 (tmp1, src->pixels + j * src->stride, 0, x_increment, dest->width); y1 = j; @@ -616,7 +611,6 @@ vs_image_scale_linear_Y (const VSImage * dest, const VSImage * src, } else { if (j == y1) { if (j + 1 != y2) { - xacc = 0; gst_videoscale_orc_resample_bilinear_u8 (tmp2, src->pixels + (j + 1) * src->stride, 0, x_increment, dest->width); y2 = j + 1; @@ -629,7 +623,6 @@ vs_image_scale_linear_Y (const VSImage * dest, const VSImage * src, } } else if (j == y2) { if (j + 1 != y1) { - xacc = 0; gst_videoscale_orc_resample_bilinear_u8 (tmp1, src->pixels + (j + 1) * src->stride, 0, x_increment, dest->width); y1 = j + 1; @@ -1098,7 +1091,6 @@ vs_image_scale_linear_AYUV64 (const VSImage * dest, const VSImage * src, int y_increment; int x_increment; int y1; - int y2; int i; int j; int x; @@ -1121,7 +1113,6 @@ vs_image_scale_linear_AYUV64 (const VSImage * dest, const VSImage * src, #define LINE(x) ((guint16 *)((tmpbuf) + (dest_size)*((x)&1))) acc = 0; - y2 = -1; //gst_videoscale_orc_resample_bilinear_u64 (LINE (0), src->pixels, // 0, x_increment, dest->width); xacc = 0;