diff options
author | Josep Torra Valles <n770galaxy@gmail.com> | 2012-09-25 00:55:59 +0100 |
---|---|---|
committer | Tim-Philipp Müller <tim@centricular.net> | 2012-09-25 00:56:26 +0100 |
commit | 111fcc6e3160389074218d927693536e7d39f92f (patch) | |
tree | 6093722fc9274c0601a0b7a82e32b328d1a72c4b | |
parent | 4b74a78a9fa401752c647c77e1a5b036a619b4b2 (diff) |
Make intel compiler happier
https://bugzilla.gnome.org/show_bug.cgi?id=552657
-rw-r--r-- | libs/gst/base/gsttypefindhelper.c | 5 | ||||
-rw-r--r-- | plugins/elements/gstfakesink.c | 2 | ||||
-rw-r--r-- | plugins/elements/gstfakesrc.c | 8 | ||||
-rw-r--r-- | plugins/elements/gstmultiqueue.c | 2 | ||||
-rw-r--r-- | plugins/elements/gsttee.c | 2 | ||||
-rw-r--r-- | tools/gst-launch.c | 2 | ||||
-rw-r--r-- | tools/tools.h | 2 |
7 files changed, 12 insertions, 11 deletions
diff --git a/libs/gst/base/gsttypefindhelper.c b/libs/gst/base/gsttypefindhelper.c index e3dba7192..febf6822f 100644 --- a/libs/gst/base/gsttypefindhelper.c +++ b/libs/gst/base/gsttypefindhelper.c @@ -114,8 +114,9 @@ helper_find_peek (gpointer data, gint64 offset, guint size) for (walk = helper->buffers; walk; walk = walk->next) { GstMappedBuffer *bmp = (GstMappedBuffer *) walk->data; GstBuffer *buf = GST_BUFFER_CAST (bmp->buffer); - guint64 buf_offset = GST_BUFFER_OFFSET (buf); - guint buf_size = gst_buffer_get_size (buf); + + buf_offset = GST_BUFFER_OFFSET (buf); + buf_size = gst_buffer_get_size (buf); /* buffers are kept sorted by end offset (highest first) in the list, so * at this point we save the current position and stop searching if diff --git a/plugins/elements/gstfakesink.c b/plugins/elements/gstfakesink.c index c328f378d..2e28b019a 100644 --- a/plugins/elements/gstfakesink.c +++ b/plugins/elements/gstfakesink.c @@ -262,7 +262,7 @@ gst_fake_sink_set_property (GObject * object, guint prop_id, switch (prop_id) { case PROP_STATE_ERROR: - sink->state_error = g_value_get_enum (value); + sink->state_error = (GstFakeSinkStateError) g_value_get_enum (value); break; case PROP_SILENT: sink->silent = g_value_get_boolean (value); diff --git a/plugins/elements/gstfakesrc.c b/plugins/elements/gstfakesrc.c index bbdff1695..ce43c381a 100644 --- a/plugins/elements/gstfakesrc.c +++ b/plugins/elements/gstfakesrc.c @@ -449,7 +449,7 @@ gst_fake_src_set_property (GObject * object, guint prop_id, g_warning ("not yet implemented"); break; case PROP_DATA: - src->data = g_value_get_enum (value); + src->data = (GstFakeSrcDataType) g_value_get_enum (value); if (src->data == FAKE_SRC_DATA_SUBBUFFER) { if (!src->parent) @@ -462,7 +462,7 @@ gst_fake_src_set_property (GObject * object, guint prop_id, } break; case PROP_SIZETYPE: - src->sizetype = g_value_get_enum (value); + src->sizetype = (GstFakeSrcSizeType) g_value_get_enum (value); break; case PROP_SIZEMIN: src->sizemin = g_value_get_int (value); @@ -474,7 +474,7 @@ gst_fake_src_set_property (GObject * object, guint prop_id, src->parentsize = g_value_get_int (value); break; case PROP_FILLTYPE: - src->filltype = g_value_get_enum (value); + src->filltype = (GstFakeSrcFillType) g_value_get_enum (value); break; case PROP_DATARATE: src->datarate = g_value_get_int (value); @@ -507,7 +507,7 @@ gst_fake_src_set_property (GObject * object, guint prop_id, gst_base_src_set_live (basesrc, g_value_get_boolean (value)); break; case PROP_FORMAT: - src->format = g_value_get_enum (value); + src->format = (GstFormat) g_value_get_enum (value); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); diff --git a/plugins/elements/gstmultiqueue.c b/plugins/elements/gstmultiqueue.c index cfa8a24dc..8afcebb4a 100644 --- a/plugins/elements/gstmultiqueue.c +++ b/plugins/elements/gstmultiqueue.c @@ -1091,7 +1091,7 @@ gst_single_queue_push_one (GstMultiQueue * mq, GstSingleQueue * sq, g_cond_signal (&sq->query_handled); GST_MULTI_QUEUE_MUTEX_UNLOCK (mq); } else { - g_warning ("Unexpected object in singlequeue %d (refcounting problem?)", + g_warning ("Unexpected object in singlequeue %u (refcounting problem?)", sq->id); } return result; diff --git a/plugins/elements/gsttee.c b/plugins/elements/gsttee.c index a00c1d1ed..f73950582 100644 --- a/plugins/elements/gsttee.c +++ b/plugins/elements/gsttee.c @@ -443,7 +443,7 @@ gst_tee_set_property (GObject * object, guint prop_id, const GValue * value, tee->silent = g_value_get_boolean (value); break; case PROP_PULL_MODE: - tee->pull_mode = g_value_get_enum (value); + tee->pull_mode = (GstTeePullMode) g_value_get_enum (value); break; case PROP_ALLOC_PAD: { diff --git a/tools/gst-launch.c b/tools/gst-launch.c index 1cce4d176..cf46d1934 100644 --- a/tools/gst-launch.c +++ b/tools/gst-launch.c @@ -1149,7 +1149,7 @@ main (int argc, char *argv[]) diff = GST_CLOCK_DIFF (tfthen, tfnow); - PRINT (_("Execution ended after %" G_GUINT64_FORMAT " ns.\n"), diff); + PRINT (_("Execution ended after %" G_GINT64_FORMAT " ns.\n"), diff); } PRINT (_("Setting pipeline to PAUSED ...\n")); diff --git a/tools/tools.h b/tools/tools.h index 084085ecb..1d4e0d427 100644 --- a/tools/tools.h +++ b/tools/tools.h @@ -48,7 +48,7 @@ gst_tools_print_version (void) gchar *version_str; version_str = gst_version_string (); - g_print ("%s version %u.%u.%u\n", g_get_prgname (), + g_print ("%s version %d.%d.%d\n", g_get_prgname (), GST_VERSION_MAJOR, GST_VERSION_MINOR, GST_VERSION_MICRO); g_print ("%s\n", version_str); g_print ("%s\n", GST_PACKAGE_ORIGIN); |