mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-03 01:02:19 +00:00
Code Issues 1 Projects Releases Wiki Activity

fix unused-but-set-variable warnings with gcc 4.6

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=647294
This commit is contained in:
Marc Plano-Lesay 2011-04-09 19:15:23 +02:00 committed by Tim-Philipp Müller
parent fecd4a1154
commit bf2b14f860
4 changed files with 7 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gst/playback/gstplaybasebin.c
View file

@ -425,7 +425,6 @@ group_commit (GstPlayBaseBin * play_base_bin, gboolean fatal, gboolean subtitle)
{ {
GstPlayBaseGroup *group; GstPlayBaseGroup *group;
gboolean had_active_group; gboolean had_active_group;
gboolean res;
GROUP_LOCK (play_base_bin); GROUP_LOCK (play_base_bin);
group = play_base_bin->building_group; 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); setup_substreams (play_base_bin);
GST_DEBUG_OBJECT (play_base_bin, "Emitting signal"); 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); (play_base_bin, group);
GST_DEBUG_OBJECT (play_base_bin, "done"); GST_DEBUG_OBJECT (play_base_bin, "done");
@ -1167,7 +1165,6 @@ probe_triggered (GstPad * pad, GstEvent * event, gpointer user_data)
GstPlayBaseGroup *group; GstPlayBaseGroup *group;
GstPlayBaseBin *play_base_bin; GstPlayBaseBin *play_base_bin;
GstStreamInfo *info; GstStreamInfo *info;
gboolean res;
GstEventType type; GstEventType type;
type = GST_EVENT_TYPE (event); type = GST_EVENT_TYPE (event);
@ -1231,8 +1228,7 @@ probe_triggered (GstPad * pad, GstEvent * event, gpointer user_data)
setup_substreams (play_base_bin); setup_substreams (play_base_bin);
GST_DEBUG ("switching to next group %p - emitting signal", group); GST_DEBUG ("switching to next group %p - emitting signal", group);
/* and signal the new 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); (play_base_bin, group);
GROUP_UNLOCK (play_base_bin); GROUP_UNLOCK (play_base_bin);

2
gst/subparse/tmplayerparse.c
View file

@ -84,7 +84,6 @@ tmplayer_parse_line (ParserState * state, const gchar * line, guint line_num)
{ {
GstClockTime ts = GST_CLOCK_TIME_NONE; GstClockTime ts = GST_CLOCK_TIME_NONE;
const gchar *text_start = NULL; const gchar *text_start = NULL;
gboolean multiline = FALSE;
gchar *ret = NULL; gchar *ret = NULL;
gchar divc = '\0'; gchar divc = '\0';
guint h, m, s, l = 1; 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); GST_LOG ("multiline format %u %u %u %u", h, m, s, l);
ts = GST_SECOND * ((((h * 60) + m) * 60) + s); ts = GST_SECOND * ((((h * 60) + m) * 60) + s);
text_start = strchr (line, '='); text_start = strchr (line, '=');
multiline = TRUE;
} else if (sscanf (line, "%u:%02u:%02u%c", &h, &m, &s, &divc) == 4 && } else if (sscanf (line, "%u:%02u:%02u%c", &h, &m, &s, &divc) == 4 &&
(divc == '=' || divc == ':')) { (divc == '=' || divc == ':')) {
GST_LOG ("single line format %u %u %u %u %c", h, m, s, l, divc); GST_LOG ("single line format %u %u %u %u %c", h, m, s, l, divc);

12
gst/tcp/gstmultifdsink.c
View file

@ -821,7 +821,7 @@ gst_multi_fd_sink_add_full (GstMultiFdSink * sink, int fd,
GstTCPClient *client; GstTCPClient *client;
GList *clink; GList *clink;
GTimeVal now; GTimeVal now;
gint flags, res; gint flags;
struct stat statbuf; struct stat statbuf;
GST_DEBUG_OBJECT (sink, "[fd %5d] adding client, sync_method %d, " 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++; sink->clients_cookie++;
/* set the socket to non blocking */ /* 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 */ /* we always read from a client */
gst_poll_add_fd (sink->fdset, &client->fd); 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 */ /* figure out the mode, can't use send() for non sockets */
res = fstat (fd, &statbuf); fstat (fd, &statbuf);
if (S_ISSOCK (statbuf.st_mode)) { if (S_ISSOCK (statbuf.st_mode)) {
client->is_socket = TRUE; client->is_socket = TRUE;
setup_dscp_client (sink, client); 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: case GST_SYNC_METHOD_BURST_KEYFRAME:
{ {
gboolean ok;
gint min_idx, max_idx; gint min_idx, max_idx;
gint next_syncframe, prev_syncframe; gint next_syncframe, prev_syncframe;
@ -1877,7 +1876,7 @@ gst_multi_fd_sink_new_client (GstMultiFdSink * sink, GstTCPClient * client)
* NEXT_KEYFRAME. * NEXT_KEYFRAME.
*/ */
/* gather burst limits */ /* 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_min_value, &max_idx, client->burst_max_unit,
client->burst_max_value); 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: case GST_SYNC_METHOD_BURST_WITH_KEYFRAME:
{ {
gboolean ok;
gint min_idx, max_idx; gint min_idx, max_idx;
gint next_syncframe; gint next_syncframe;
@ -1925,7 +1923,7 @@ gst_multi_fd_sink_new_client (GstMultiFdSink * sink, GstTCPClient * client)
* amount of data up 'till min. * amount of data up 'till min.
*/ */
/* gather enough data to burst */ /* 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_min_value, &max_idx, client->burst_max_unit,
client->burst_max_value); client->burst_max_value);

9
gst/videoscale/vs_image.c
View file

@ -85,7 +85,6 @@ vs_image_scale_linear_RGBA (const VSImage * dest, const VSImage * src,
int y_increment; int y_increment;
int x_increment; int x_increment;
int y1; int y1;
int y2;
int i; int i;
int j; int j;
int x; 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)) #define LINE(x) ((tmpbuf) + (dest_size)*((x)&1))
acc = 0; acc = 0;
y2 = -1;
gst_videoscale_orc_resample_bilinear_u32 (LINE (0), src->pixels, gst_videoscale_orc_resample_bilinear_u32 (LINE (0), src->pixels,
0, x_increment, dest->width); 0, x_increment, dest->width);
y1 = 0; y1 = 0;
@ -574,7 +572,6 @@ vs_image_scale_linear_Y (const VSImage * dest, const VSImage * src,
int j; int j;
int x; int x;
int dest_size; int dest_size;
int xacc;
if (dest->height == 1) if (dest->height == 1)
y_increment = 0; y_increment = 0;
@ -592,7 +589,6 @@ vs_image_scale_linear_Y (const VSImage * dest, const VSImage * src,
tmp2 = tmpbuf + dest_size; tmp2 = tmpbuf + dest_size;
acc = 0; acc = 0;
xacc = 0;
y2 = -1; y2 = -1;
gst_videoscale_orc_resample_bilinear_u8 (tmp1, src->pixels, gst_videoscale_orc_resample_bilinear_u8 (tmp1, src->pixels,
0, x_increment, dest->width); 0, x_increment, dest->width);
@ -607,7 +603,6 @@ vs_image_scale_linear_Y (const VSImage * dest, const VSImage * src,
} else if (j == y2) { } else if (j == y2) {
memcpy (dest->pixels + i * dest->stride, tmp2, dest_size); memcpy (dest->pixels + i * dest->stride, tmp2, dest_size);
} else { } else {
xacc = 0;
gst_videoscale_orc_resample_bilinear_u8 (tmp1, gst_videoscale_orc_resample_bilinear_u8 (tmp1,
src->pixels + j * src->stride, 0, x_increment, dest->width); src->pixels + j * src->stride, 0, x_increment, dest->width);
y1 = j; y1 = j;
@ -616,7 +611,6 @@ vs_image_scale_linear_Y (const VSImage * dest, const VSImage * src,
} else { } else {
if (j == y1) { if (j == y1) {
if (j + 1 != y2) { if (j + 1 != y2) {
xacc = 0;
gst_videoscale_orc_resample_bilinear_u8 (tmp2, gst_videoscale_orc_resample_bilinear_u8 (tmp2,
src->pixels + (j + 1) * src->stride, 0, x_increment, dest->width); src->pixels + (j + 1) * src->stride, 0, x_increment, dest->width);
y2 = j + 1; y2 = j + 1;
@ -629,7 +623,6 @@ vs_image_scale_linear_Y (const VSImage * dest, const VSImage * src,
} }
} else if (j == y2) { } else if (j == y2) {
if (j + 1 != y1) { if (j + 1 != y1) {
xacc = 0;
gst_videoscale_orc_resample_bilinear_u8 (tmp1, gst_videoscale_orc_resample_bilinear_u8 (tmp1,
src->pixels + (j + 1) * src->stride, 0, x_increment, dest->width); src->pixels + (j + 1) * src->stride, 0, x_increment, dest->width);
y1 = j + 1; y1 = j + 1;
@ -1098,7 +1091,6 @@ vs_image_scale_linear_AYUV64 (const VSImage * dest, const VSImage * src,
int y_increment; int y_increment;
int x_increment; int x_increment;
int y1; int y1;
int y2;
int i; int i;
int j; int j;
int x; 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))) #define LINE(x) ((guint16 *)((tmpbuf) + (dest_size)*((x)&1)))
acc = 0; acc = 0;
y2 = -1;
//gst_videoscale_orc_resample_bilinear_u64 (LINE (0), src->pixels, //gst_videoscale_orc_resample_bilinear_u64 (LINE (0), src->pixels,
// 0, x_increment, dest->width); // 0, x_increment, dest->width);
xacc = 0; xacc = 0;