diff options
| author | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-08-26 14:37:54 +0200 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-08-26 14:37:54 +0200 |
| commit | 5cf8e689440493c51cfc94e178af94f25b04e526 (patch) | |
| tree | fcffdf4cf6ef72bff97316f527e5c72d8182d580 /gst/gsttask.c | |
| parent | d924c30f5b881677c32e10b63c844c20d41d526a (diff) | |
| parent | 185ab7f325da9b8ff3f9c9e16b47d2bea2fc3636 (diff) | |
| download | gstreamer-5cf8e689440493c51cfc94e178af94f25b04e526.tar.gz | |
Merge branch 'master' into 0.11
Conflicts:
gst/gstmessage.c
gst/gstquery.c
gst/gstregistrychunks.c
gst/gstsegment.c
libs/gst/base/gstbasetransform.c
libs/gst/base/gstbasetransform.h
libs/gst/base/gsttypefindhelper.c
plugins/elements/gsttypefindelement.c
Diffstat (limited to 'gst/gsttask.c')
| -rw-r--r-- | gst/gsttask.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gst/gsttask.c b/gst/gsttask.c index 961f816b4f..aac6b7a257 100644 --- a/gst/gsttask.c +++ b/gst/gsttask.c @@ -83,7 +83,7 @@ GST_DEBUG_CATEGORY_STATIC (task_debug); #define GST_CAT_DEFAULT (task_debug) #define SET_TASK_STATE(t,s) (g_atomic_int_set (&GST_TASK_STATE(t), (s))) -#define GET_TASK_STATE(t) (g_atomic_int_get (&GST_TASK_STATE(t))) +#define GET_TASK_STATE(t) ((GstTaskState) g_atomic_int_get (&GST_TASK_STATE(t))) #define GST_TASK_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GST_TYPE_TASK, GstTaskPrivate)) |