From 7e4f99512fa7ac27f015ee2d2e0a8f2640968a1c Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Fri, 27 May 2022 13:30:07 +0200 Subject: [PATCH] v4l2: cast varargs to the right type The controls have 64 bits but the int varargs expect an int value, which is not always 64 bits. See #2400 --- spa/plugins/v4l2/v4l2-utils.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/spa/plugins/v4l2/v4l2-utils.c b/spa/plugins/v4l2/v4l2-utils.c index 55bbb07db..80fa2bd87 100644 --- a/spa/plugins/v4l2/v4l2-utils.c +++ b/spa/plugins/v4l2/v4l2-utils.c @@ -1156,17 +1156,17 @@ spa_v4l2_enum_controls(struct impl *this, int seq, SPA_TYPE_OBJECT_PropInfo, SPA_PARAM_PropInfo, SPA_PROP_INFO_id, SPA_POD_Id(prop_id), SPA_PROP_INFO_type, SPA_POD_CHOICE_STEP_Int( - queryctrl.default_value, - queryctrl.minimum, - queryctrl.maximum, - queryctrl.step), + (int32_t)queryctrl.default_value, + (int32_t)queryctrl.minimum, + (int32_t)queryctrl.maximum, + (int32_t)queryctrl.step), SPA_PROP_INFO_description, SPA_POD_String(queryctrl.name)); break; case V4L2_CTRL_TYPE_BOOLEAN: param = spa_pod_builder_add_object(&b, SPA_TYPE_OBJECT_PropInfo, SPA_PARAM_PropInfo, SPA_PROP_INFO_id, SPA_POD_Id(prop_id), - SPA_PROP_INFO_type, SPA_POD_CHOICE_Bool(queryctrl.default_value), + SPA_PROP_INFO_type, SPA_POD_CHOICE_Bool((bool)queryctrl.default_value), SPA_PROP_INFO_description, SPA_POD_String(queryctrl.name)); break; case V4L2_CTRL_TYPE_MENU: @@ -1177,7 +1177,7 @@ spa_v4l2_enum_controls(struct impl *this, int seq, spa_pod_builder_push_object(&b, &f[0], SPA_TYPE_OBJECT_PropInfo, SPA_PARAM_PropInfo); spa_pod_builder_add(&b, SPA_PROP_INFO_id, SPA_POD_Id(prop_id), - SPA_PROP_INFO_type, SPA_POD_CHOICE_ENUM_Int(1, queryctrl.default_value), + SPA_PROP_INFO_type, SPA_POD_CHOICE_ENUM_Int(1, (int32_t)queryctrl.default_value), SPA_PROP_INFO_description, SPA_POD_String(queryctrl.name), 0);