The branch, master has been updated
via 9ed71a837b9416a7d1e28335fff3f4a43807addc (commit)
via 3cc10b5ff6fb2752a2a080cfd6353c6844567f87 (commit)
via f7b7972f783a368142676a92f30549cee4fd5918 (commit)
from f4312ea13824e1ec862c4f8345800ce67d249f59 (commit)
- Log -----------------------------------------------------------------
commit 9ed71a837b9416a7d1e28335fff3f4a43807addc
Author: Kacper MichajÅow <[email protected]>
AuthorDate: Mon Dec 1 21:30:26 2025 +0100
Commit: Kacper MichajÅow <[email protected]>
CommitDate: Wed Dec 3 23:45:44 2025 +0000
avutil/vulkan: fix device memory size truncation
size_t cannot fit VK_WHOLE_SIZE on 32-bit builds.
Fixes: warning: conversion from 'long long unsigned int' to 'size_t' {aka
'unsigned int'} changes value from '18446744073709551615' to '4294967295'
Signed-off-by: Kacper MichajÅow <[email protected]>
diff --git a/libavutil/vulkan.c b/libavutil/vulkan.c
index 3015a536c2..7858e002ed 100644
--- a/libavutil/vulkan.c
+++ b/libavutil/vulkan.c
@@ -1168,7 +1168,7 @@ int ff_vk_map_buffers(FFVulkanContext *s, FFVkBuffer
**buf, uint8_t *mem[],
}
int ff_vk_flush_buffer(FFVulkanContext *s, FFVkBuffer *buf,
- size_t offset, size_t mem_size,
+ VkDeviceSize offset, VkDeviceSize mem_size,
int flush)
{
VkResult ret;
diff --git a/libavutil/vulkan.h b/libavutil/vulkan.h
index 868788c2a4..29116bcb2c 100644
--- a/libavutil/vulkan.h
+++ b/libavutil/vulkan.h
@@ -527,7 +527,7 @@ int ff_vk_create_buf(FFVulkanContext *s, FFVkBuffer *buf,
size_t size,
* Flush or invalidate a single buffer, with a given size and offset.
*/
int ff_vk_flush_buffer(FFVulkanContext *s, FFVkBuffer *buf,
- size_t offset, size_t mem_size,
+ VkDeviceSize offset, VkDeviceSize mem_size,
int flush);
/**
commit 3cc10b5ff6fb2752a2a080cfd6353c6844567f87
Author: Kacper MichajÅow <[email protected]>
AuthorDate: Mon Dec 1 21:21:25 2025 +0100
Commit: Kacper MichajÅow <[email protected]>
CommitDate: Wed Dec 3 23:45:44 2025 +0000
fftools/cmdutils: use strcpy directly, the length is computed already
There is no need to scan for NULL, if we inject it ourselves.
Fixes: warning: 'strncat' specified bound 10 equals source length
[-Wstringop-overflow=]
Signed-off-by: Kacper MichajÅow <[email protected]>
diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c
index e906d4506d..9a365c228d 100644
--- a/fftools/cmdutils.c
+++ b/fftools/cmdutils.c
@@ -962,8 +962,7 @@ FILE *get_preset_file(char *filename, size_t filename_size,
datadir, desired_size, sizeof *datadir);
if (new_datadir) {
datadir = new_datadir;
- datadir[datadir_len] = 0;
- strncat(datadir, "/ffpresets", desired_size - 1 -
datadir_len);
+ strcpy(datadir + datadir_len, "/ffpresets");
base[2] = datadir;
}
}
commit f7b7972f783a368142676a92f30549cee4fd5918
Author: Kacper MichajÅow <[email protected]>
AuthorDate: Mon Dec 1 21:09:34 2025 +0100
Commit: Kacper MichajÅow <[email protected]>
CommitDate: Wed Dec 3 23:45:44 2025 +0000
avdevice/gdigrab: suppress int to pointer cast warning
Fixes: warning: cast to pointer from integer of different size
[-Wint-to-pointer-cast]
Signed-off-by: Kacper MichajÅow <[email protected]>
diff --git a/libavdevice/gdigrab.c b/libavdevice/gdigrab.c
index 08a41c304b..fa9ba27db0 100644
--- a/libavdevice/gdigrab.c
+++ b/libavdevice/gdigrab.c
@@ -279,7 +279,7 @@ gdigrab_read_header(AVFormatContext *s1)
char *p;
name = filename + 5;
- hwnd = (HWND) strtoull(name, &p, 0);
+ hwnd = (HWND)(intptr_t) strtoull(name, &p, 0);
if (p == NULL || p == name || p[0] != '\0')
{
-----------------------------------------------------------------------
Summary of changes:
fftools/cmdutils.c | 3 +--
libavdevice/gdigrab.c | 2 +-
libavutil/vulkan.c | 2 +-
libavutil/vulkan.h | 2 +-
4 files changed, 4 insertions(+), 5 deletions(-)
hooks/post-receive
--
_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]
