diff --git a/spa/include/spa/param/video/format-utils.h b/spa/include/spa/param/video/format-utils.h index 146a51b09..0a0f93b37 100644 --- a/spa/include/spa/param/video/format-utils.h +++ b/spa/include/spa/param/video/format-utils.h @@ -54,13 +54,19 @@ static inline struct spa_pod * spa_format_video_raw_build(struct spa_pod_builder *builder, uint32_t id, struct spa_video_info_raw *info) { - return spa_pod_builder_object(builder, - SPA_TYPE_OBJECT_Format, id, - SPA_FORMAT_mediaType, &SPA_POD_Id(SPA_MEDIA_TYPE_video), - SPA_FORMAT_mediaSubtype, &SPA_POD_Id(SPA_MEDIA_SUBTYPE_raw), - SPA_FORMAT_VIDEO_format, &SPA_POD_Id(info->format), - SPA_FORMAT_VIDEO_size, &SPA_POD_Rectangle(info->size), - SPA_FORMAT_VIDEO_framerate, &SPA_POD_Fraction(info->framerate), + const struct spa_pod_id media_type = SPA_POD_Id(SPA_MEDIA_TYPE_video); + const struct spa_pod_id media_subtype = SPA_POD_Id(SPA_MEDIA_SUBTYPE_raw); + const struct spa_pod_id format = SPA_POD_Id(info->format); + const struct spa_pod_rectangle size = SPA_POD_Rectangle(info->size); + const struct spa_pod_fraction framerate = SPA_POD_Fraction(info->framerate); + + return (struct spa_pod *) spa_pod_builder_object(builder, + SPA_TYPE_OBJECT_Format, id, + SPA_FORMAT_mediaType, &media_type, + SPA_FORMAT_mediaSubtype, &media_subtype, + SPA_FORMAT_VIDEO_format, &format, + SPA_FORMAT_VIDEO_size, &size, + SPA_FORMAT_VIDEO_framerate, &framerate, 0); } diff --git a/spa/include/spa/pod/builder.h b/spa/include/spa/pod/builder.h index 9ff72c4d7..aa9642397 100644 --- a/spa/include/spa/pod/builder.h +++ b/spa/include/spa/pod/builder.h @@ -656,7 +656,7 @@ static inline void spa_pod_builder_prop_val(struct spa_pod_builder *builder, uint32_t key, void *pod) { spa_pod_builder_prop(builder, key, 0); - spa_pod_builder_primitive(builder, pod); + spa_pod_builder_primitive(builder,(const struct spa_pod *) pod); } static inline void spa_pod_builder_propsv(struct spa_pod_builder *builder, diff --git a/src/pipewire/pipewire.c b/src/pipewire/pipewire.c index a9aae2cd7..50c031c56 100644 --- a/src/pipewire/pipewire.c +++ b/src/pipewire/pipewire.c @@ -317,7 +317,7 @@ const struct spa_support *pw_get_support(uint32_t *n_support) void *pw_load_spa_interface(const char *lib, const char *factory_name, uint32_t type, const struct spa_dict *info, uint32_t n_support, - struct spa_support support[n_support]) + struct spa_support support[]) { struct support *sup = &global_support; struct spa_support extra_support[MAX_SUPPORT]; diff --git a/src/pipewire/pipewire.h b/src/pipewire/pipewire.h index 894c04d18..f07c0e137 100644 --- a/src/pipewire/pipewire.h +++ b/src/pipewire/pipewire.h @@ -136,7 +136,7 @@ pw_get_support_interface(uint32_t type); void *pw_load_spa_interface(const char *lib, const char *factory_name, uint32_t type, const struct spa_dict *info, uint32_t n_support, - struct spa_support support[n_support]); + struct spa_support support[]); void *pw_load_spa_dbus_interface(struct pw_loop *loop);