mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-02 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix build with c++ compilers

Browse source
This commit is contained in:
Jan Grulich 2018-10-30 12:37:14 +00:00 • committed by Wim Taymans
parent 2aeb5d9d98
commit a813afd810
4 changed files with 16 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
spa/include/spa/param/video/format-utils.h
View file

@ -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);
}

2
spa/include/spa/pod/builder.h
View file

@ -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,