summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Waters <matthew@centricular.com>2017-02-01 16:05:23 +1100
committerSebastian Dröge <sebastian@centricular.com>2017-02-02 12:39:54 +0200
commit91f3ec77ff53900f23f63600e6b0e1db281ecf07 (patch)
treebb08b5d64a67c3fd972be0155bd75383981f5536
parent92462d6a271473f16ce70071ea49a072b42713f1 (diff)
downloadgstreamer-plugins-bad-91f3ec77ff53900f23f63600e6b0e1db281ecf07.tar.gz
vkwindow: fix build error on i386
Vulkan handles are either pointers (64-bit) or 64-bit integer handles (32-bit). Cast the type in failure cases. vkwindow.c:229:561: error: return makes integer from pointer without a cast [-Werror=int-conversion] vkwindow.c:231:194: error: return makes integer from pointer without a cast [-Werror=int-conversion] https://bugzilla.gnome.org/show_bug.cgi?id=777979
-rw-r--r--ext/vulkan/vkwindow.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/vulkan/vkwindow.c b/ext/vulkan/vkwindow.c
index 56b3e6063..ab8c45c5f 100644
--- a/ext/vulkan/vkwindow.c
+++ b/ext/vulkan/vkwindow.c
@@ -226,9 +226,9 @@ gst_vulkan_window_get_surface (GstVulkanWindow * window, GError ** error)
{
GstVulkanWindowClass *klass;
- g_return_val_if_fail (GST_IS_VULKAN_WINDOW (window), NULL);
+ g_return_val_if_fail (GST_IS_VULKAN_WINDOW (window), (VkSurfaceKHR) 0);
klass = GST_VULKAN_WINDOW_GET_CLASS (window);
- g_return_val_if_fail (klass->get_surface != NULL, NULL);
+ g_return_val_if_fail (klass->get_surface != NULL, (VkSurfaceKHR) 0);
return klass->get_surface (window, error);
}