diff options
| author | Nicolas Dufresne <nicolas.dufresne@collabora.co.uk> | 2015-06-13 12:25:19 -0400 |
|---|---|---|
| committer | Nicolas Dufresne <nicolas.dufresne@collabora.co.uk> | 2015-06-13 12:25:19 -0400 |
| commit | a65cea7c6990dcd81384824877dc8c7af9d04fbe (patch) | |
| tree | 68afae0fffd70da63db37eada7cddd74afd112a3 | |
| parent | 0e8a318dd7fe35499f8b87dd64c9a6215e04d0f7 (diff) | |
gstprotection: Add missing namespace to macro
GST_PROTECTION_SYSTEM_ID_CAPS_FIELD was missing the GST_ namespace.
Add it before its too late.
| -rw-r--r-- | gst/gstprotection.c | 6 | ||||
| -rw-r--r-- | gst/gstprotection.h | 11 | ||||
| -rw-r--r-- | tests/check/gst/gstprotection.c | 2 |
3 files changed, 12 insertions, 7 deletions
diff --git a/gst/gstprotection.c b/gst/gstprotection.c index 36f36adf6..9d25fb984 100644 --- a/gst/gstprotection.c +++ b/gst/gstprotection.c @@ -187,10 +187,10 @@ gst_protection_factory_check (GstElementFactory * fact, GstStructure *st; st = gst_caps_get_structure (caps, i); - if (gst_structure_has_field_typed (st, PROTECTION_SYSTEM_ID_CAPS_FIELD, - G_TYPE_STRING)) { + if (gst_structure_has_field_typed (st, + GST_PROTECTION_SYSTEM_ID_CAPS_FIELD, G_TYPE_STRING)) { const gchar *sys_id = - gst_structure_get_string (st, PROTECTION_SYSTEM_ID_CAPS_FIELD); + gst_structure_get_string (st, GST_PROTECTION_SYSTEM_ID_CAPS_FIELD); GST_DEBUG ("Found decryptor that supports protection system %s", sys_id); for (guint j = 0; !retval && system_identifiers[j]; ++j) { diff --git a/gst/gstprotection.h b/gst/gstprotection.h index 9a4b86a01..113216445 100644 --- a/gst/gstprotection.h +++ b/gst/gstprotection.h @@ -24,10 +24,15 @@ G_BEGIN_DECLS -/* @PROTECTION_SYSTEM_ID_CAPS_FIELD: The field name in a GstCaps that is - * used to signal the UUID of the protection system +/** + * GST_PROTECTION_SYSTEM_ID_CAPS_FIELD: + * + * The field name in a GstCaps that is used to signal the UUID of the protection + * system. + * + * Since 1.6 */ -#define PROTECTION_SYSTEM_ID_CAPS_FIELD "protection-system" +#define GST_PROTECTION_SYSTEM_ID_CAPS_FIELD "protection-system" typedef struct _GstProtectionMeta GstProtectionMeta; /** diff --git a/tests/check/gst/gstprotection.c b/tests/check/gst/gstprotection.c index 3f11f8a09..89181f893 100644 --- a/tests/check/gst/gstprotection.c +++ b/tests/check/gst/gstprotection.c @@ -68,7 +68,7 @@ GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_ALWAYS, GST_STATIC_CAPS ("application/x-cenc, original-media-type=(string)video/x-h264, " - PROTECTION_SYSTEM_ID_CAPS_FIELD "=(string)" CLEARKEY_SYSTEM_ID) + GST_PROTECTION_SYSTEM_ID_CAPS_FIELD "=(string)" CLEARKEY_SYSTEM_ID) ); static void |