mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-19 06:46:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

tagsetter: use GST_TAG_MERGE_UNDEFINED instead of FALSE

Browse source 
Fixes warning #188: enumerated type mixed with another type reported by ICC.
This commit is contained in:
Josep Torra 2011-08-25 21:49:29 +02:00
parent c0b0b977d7
commit 95b96b57a2
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gst/gstsystemclock.c
View file

@ -55,7 +55,7 @@
# define EWOULDBLOCK EAGAIN /* This is just to placate gcc */ # define EWOULDBLOCK EAGAIN /* This is just to placate gcc */
#endif /* G_OS_WIN32 */ #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 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(\ #define CAS_ENTRY_STATUS(e,old,val) (G_ATOMIC_INT_COMPARE_AND_EXCHANGE(\
(&GST_CLOCK_ENTRY_STATUS(e)), (old), (val))) (&GST_CLOCK_ENTRY_STATUS(e)), (old), (val)))
@ -237,7 +237,7 @@ gst_system_clock_set_property (GObject * object, guint prop_id,
switch (prop_id) { switch (prop_id) {
case PROP_CLOCK_TYPE: 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", GST_CAT_DEBUG (GST_CAT_CLOCK, "clock-type set to %d",
sysclock->priv->clock_type); sysclock->priv->clock_type);
break; break;

2
gst/gsttagsetter.c
View file

@ -412,7 +412,7 @@ gst_tag_setter_get_tag_merge_mode (GstTagSetter * setter)
GstTagMergeMode mode; GstTagMergeMode mode;
GstTagData *data; 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); data = gst_tag_setter_get_data (setter);