diff options
| author | Josep Torra <n770galaxy@gmail.com> | 2011-08-25 21:49:29 +0200 |
|---|---|---|
| committer | Josep Torra <n770galaxy@gmail.com> | 2011-08-26 14:11:14 +0200 |
| commit | 95b96b57a25a5e9745cee0fef543f2061c630579 (patch) | |
| tree | 2e0f801167361846455ca293c57f53f8d054dbdf | |
| parent | c0b0b977d7996be5fa6837644a264ad82be0aaf6 (diff) | |
tagsetter: use GST_TAG_MERGE_UNDEFINED instead of FALSE
Fixes warning #188: enumerated type mixed with another type reported by ICC.
| -rw-r--r-- | gst/gstsystemclock.c | 4 | ||||
| -rw-r--r-- | gst/gsttagsetter.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/gst/gstsystemclock.c b/gst/gstsystemclock.c index 938704e54..ef691fd17 100644 --- a/gst/gstsystemclock.c +++ b/gst/gstsystemclock.c @@ -55,7 +55,7 @@ # define EWOULDBLOCK EAGAIN /* This is just to placate gcc */ #endif /* G_OS_WIN32 */ -#define GET_ENTRY_STATUS(e) (g_atomic_int_get(&GST_CLOCK_ENTRY_STATUS(e))) +#define GET_ENTRY_STATUS(e) ((GstClockReturn) g_atomic_int_get(&GST_CLOCK_ENTRY_STATUS(e))) #define SET_ENTRY_STATUS(e,val) (g_atomic_int_set(&GST_CLOCK_ENTRY_STATUS(e),(val))) #define CAS_ENTRY_STATUS(e,old,val) (G_ATOMIC_INT_COMPARE_AND_EXCHANGE(\ (&GST_CLOCK_ENTRY_STATUS(e)), (old), (val))) @@ -237,7 +237,7 @@ gst_system_clock_set_property (GObject * object, guint prop_id, switch (prop_id) { case PROP_CLOCK_TYPE: - sysclock->priv->clock_type = g_value_get_enum (value); + sysclock->priv->clock_type = (GstClockType) g_value_get_enum (value); GST_CAT_DEBUG (GST_CAT_CLOCK, "clock-type set to %d", sysclock->priv->clock_type); break; diff --git a/gst/gsttagsetter.c b/gst/gsttagsetter.c index 5f15e4121..d08d7e883 100644 --- a/gst/gsttagsetter.c +++ b/gst/gsttagsetter.c @@ -412,7 +412,7 @@ gst_tag_setter_get_tag_merge_mode (GstTagSetter * setter) GstTagMergeMode mode; GstTagData *data; - g_return_val_if_fail (GST_IS_TAG_SETTER (setter), FALSE); + g_return_val_if_fail (GST_IS_TAG_SETTER (setter), GST_TAG_MERGE_UNDEFINED); data = gst_tag_setter_get_data (setter); |