History

dmabuf: fix warnings on 320-bit build

Kacper Michajłow committed 2 years ago

Commit 325abfe1 parent aa9cc722 files · +4 −4Browse files

Unified · Split

2 files
  1. video/out/hwdec/dmabuf_interop_wl.c +2 −2
  2. video/out/vo_dmabuf_wayland.c +2 −2
video/out/hwdec/dmabuf_interop_wl.c+2−2
@@ -46,7 +46,7 @@ static bool map(struct ra_hwdec_mapper *mapper, · 45 unmodified lines
4646 return false;
4747 } else if (!ra_compatible_format(mapper->ra, drm_format,
4848 mapper_p->desc.objects[0].format_modifier)) {
49− MP_VERBOSE(mapper, "Mapped surface with format %s; drm format '%s(%016lx)' "
49+ MP_VERBOSE(mapper, "Mapped surface with format %s; drm format '%s(%016" PRIx64 ")' "
5050 "is not supported by compositor.\n",
5151 mp_imgfmt_to_name(mapper->src->params.hw_subfmt),
5252 mp_tag_str(drm_format),
@@ -54,7 +54,7 @@ static bool map(struct ra_hwdec_mapper *mapper, · 1 unmodified line
5454 return false;
5555 }
5656
57− MP_VERBOSE(mapper, "Supported Wayland display format %s: '%s(%016lx)'\n",
57+ MP_VERBOSE(mapper, "Supported Wayland display format %s: '%s(%016" PRIx64 ")'\n",
5858 mp_imgfmt_to_name(mapper->src->params.hw_subfmt),
5959 mp_tag_str(drm_format), mapper_p->desc.objects[0].format_modifier);
6060
video/out/vo_dmabuf_wayland.c+2−2
@@ -203,7 +203,7 @@ static void vaapi_dmabuf_importer(struct buffer *buf, struct mp_image *src, · 202 unmodified lines
203203 }
204204 buf->drm_format = desc.layers[layer_no].drm_format;
205205 if (!ra_compatible_format(p->ctx->ra, buf->drm_format, desc.objects[0].drm_format_modifier)) {
206− MP_VERBOSE(vo, "%s(%016lx) is not supported.\n",
206+ MP_VERBOSE(vo, "%s(%016" PRIx64 ") is not supported.\n",
207207 mp_tag_str(buf->drm_format), desc.objects[0].drm_format_modifier);
208208 buf->drm_format = 0;
209209 goto done;
@@ -685,7 +685,7 @@ static int reconfig(struct vo *vo, struct mp_image *img) · 475 unmodified lines
685685 }
686686
687687 if (!ra_compatible_format(p->ctx->ra, p->drm_format, p->drm_modifier)) {
688− MP_ERR(vo, "Format '%s' with modifier '(%016lx)' is not supported by"
688+ MP_ERR(vo, "Format '%s' with modifier '(%016" PRIx64 ")' is not supported by"
689689 " the compositor.\n", mp_tag_str(p->drm_format), p->drm_modifier);
690690 return VO_ERROR;
691691 }

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t