diff options
| author | Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk> | 2012-04-17 15:22:59 +0200 |
|---|---|---|
| committer | Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk> | 2012-04-17 15:22:59 +0200 |
| commit | 65787972455106bff29c37d4ffcde116c33e0fb0 (patch) | |
| tree | 6ba6467e6985fcf04300992533bef282a232d200 /sys/winks | |
| parent | 156d80d74b4088c39a3d2909bdd91eb494e5abd5 (diff) | |
| download | gstreamer-plugins-bad-65787972455106bff29c37d4ffcde116c33e0fb0.tar.gz | |
collectpads2: rename to collectpads
Diffstat (limited to 'sys/winks')
| -rw-r--r-- | sys/winks/kshelpers.c | 2 | ||||
| -rw-r--r-- | sys/winks/ksvideohelpers.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sys/winks/kshelpers.c b/sys/winks/kshelpers.c index d170180a4..787b31580 100644 --- a/sys/winks/kshelpers.c +++ b/sys/winks/kshelpers.c @@ -318,7 +318,7 @@ gchar * ks_guid_to_string (const GUID * guid) { return g_strdup_printf ("{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", - guid->Data1, guid->Data2, guid->Data3, guid->Data4[0], guid->Data4[1], + guid->Data1, guid->Data, guid->Data3, guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7]); } diff --git a/sys/winks/ksvideohelpers.c b/sys/winks/ksvideohelpers.c index 1772e5bcc..e8981222f 100644 --- a/sys/winks/ksvideohelpers.c +++ b/sys/winks/ksvideohelpers.c @@ -229,7 +229,7 @@ ks_video_format_to_structure (GUID subtype_guid, GUID format_guid) "format", GST_TYPE_FOURCC, GST_MAKE_FOURCC ('d', 'v', 's', 'd'), NULL); } - } else if (memcmp (&subtype_guid.Data2, &MEDIASUBTYPE_FOURCC.Data2, + } else if (memcmp (&subtype_guid.Data, &MEDIASUBTYPE_FOURCC.Data, sizeof (subtype_guid) - sizeof (subtype_guid.Data1)) == 0) { guint8 *p = (guint8 *) & subtype_guid.Data1; @@ -240,7 +240,7 @@ ks_video_format_to_structure (GUID subtype_guid, GUID format_guid) if (!structure) { GST_DEBUG ("Unknown DirectShow Video GUID %08x-%04x-%04x-%04x-%08x%04x", - subtype_guid.Data1, subtype_guid.Data2, subtype_guid.Data3, + subtype_guid.Data1, subtype_guid.Data, subtype_guid.Data3, *(WORD *) subtype_guid.Data4, *(DWORD *) & subtype_guid.Data4[2], *(WORD *) & subtype_guid.Data4[6]); } |