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/gstpad.h | |
| 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/gstpad.h')
| -rw-r--r-- | gst/gstpad.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gst/gstpad.h b/gst/gstpad.h index 51e30a7bc2..7470a5c0f1 100644 --- a/gst/gstpad.h +++ b/gst/gstpad.h @@ -209,7 +209,7 @@ typedef enum { * * Since: 0.10.30 */ -#define GST_PAD_LINK_CHECK_DEFAULT (GST_PAD_LINK_CHECK_HIERARCHY | GST_PAD_LINK_CHECK_CAPS) +#define GST_PAD_LINK_CHECK_DEFAULT ((GstPadLinkCheck) (GST_PAD_LINK_CHECK_HIERARCHY | GST_PAD_LINK_CHECK_CAPS)) /** * GstActivateMode: |