From: Jamaika1 via ffmpeg-devel <ffmpeg-devel@ffmpeg.org>
To: ffmpeg-devel@ffmpeg.org
Cc: Jamaika1 <code@ffmpeg.org>
Subject: [FFmpeg-devel] [PATCH] Double filters.h removed (PR #20409)
Message-ID: <175689034583.25.4640811126560912483@463a07221176> (raw)
PR #20409 opened by Jamaika1
URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20409
Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20409.patch
>From b2d9daf92b0c0da80155758e80ac7442aefb53f4 Mon Sep 17 00:00:00 2001
From: Jamaika1 <lukaszcz18@wp.pl>
Date: Wed, 3 Sep 2025 08:42:29 +0000
Subject: [PATCH 1/9] Fix: change integer %zu
---
libavcodec/hevc/hevcdec.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/hevc/hevcdec.c b/libavcodec/hevc/hevcdec.c
index d3e5e58cfc..c3f2627369 100644
--- a/libavcodec/hevc/hevcdec.c
+++ b/libavcodec/hevc/hevcdec.c
@@ -3523,7 +3523,7 @@ static int hevc_frame_end(HEVCContext *s, HEVCLayerContext *l)
}
s->sei.picture_hash.is_md5 = 0;
- av_log(s->avctx, AV_LOG_DEBUG, "Decoded frame with POC %zu/%d.\n",
+ av_log(s->avctx, AV_LOG_DEBUG, "Decoded frame with POC %"SIZE_SPECIFIER"/%d.\n",
l - s->layers, s->poc);
return 0;
--
2.49.1
>From e6f9e4196ec6f6e36f1a728862e9caae1afdae46 Mon Sep 17 00:00:00 2001
From: Jamaika1 <lukaszcz18@wp.pl>
Date: Wed, 3 Sep 2025 08:45:59 +0000
Subject: [PATCH 2/9] Fix: change integer %zu
---
libavcodec/cbs_apv_syntax_template.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/libavcodec/cbs_apv_syntax_template.c b/libavcodec/cbs_apv_syntax_template.c
index 621595ffbf..72527b9716 100644
--- a/libavcodec/cbs_apv_syntax_template.c
+++ b/libavcodec/cbs_apv_syntax_template.c
@@ -323,7 +323,7 @@ static int FUNC(metadata_itu_t_t35)(CodedBitstreamContext *ctx,
#else
if (current->data_size != read_size) {
av_log(ctx->log_ctx, AV_LOG_ERROR, "Write size mismatch: "
- "payload %zu but expecting %zu\n",
+ "payload %"SIZE_SPECIFIER" but expecting %"SIZE_SPECIFIER"\n",
current->data_size, read_size);
return AVERROR(EINVAL);
}
@@ -409,7 +409,7 @@ static int FUNC(metadata_user_defined)(CodedBitstreamContext *ctx,
#else
if (current->data_size != payload_size - 16) {
av_log(ctx->log_ctx, AV_LOG_ERROR, "Write size mismatch: "
- "payload %zu but expecting %zu\n",
+ "payload %"SIZE_SPECIFIER" but expecting %"SIZE_SPECIFIER"\n",
current->data_size, payload_size - 16);
return AVERROR(EINVAL);
}
@@ -441,7 +441,7 @@ static int FUNC(metadata_undefined)(CodedBitstreamContext *ctx,
#else
if (current->data_size != payload_size) {
av_log(ctx->log_ctx, AV_LOG_ERROR, "Write size mismatch: "
- "payload %zu but expecting %zu\n",
+ "payload %"SIZE_SPECIFIER" but expecting %"SIZE_SPECIFIER"\n",
current->data_size, payload_size - 16);
return AVERROR(EINVAL);
}
--
2.49.1
>From 7e89fe98a12e899b97634a1501bea745636695e9 Mon Sep 17 00:00:00 2001
From: Jamaika1 <lukaszcz18@wp.pl>
Date: Wed, 3 Sep 2025 08:48:06 +0000
Subject: [PATCH 3/9] Fix: change integer %zu
---
libavcodec/d3d12va_encode_hevc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/d3d12va_encode_hevc.c b/libavcodec/d3d12va_encode_hevc.c
index 4f4dda1f8f..ac52486421 100644
--- a/libavcodec/d3d12va_encode_hevc.c
+++ b/libavcodec/d3d12va_encode_hevc.c
@@ -175,7 +175,7 @@ static int d3d12va_encode_hevc_write_access_unit(AVCodecContext *avctx,
if (*data_len < 8 * au->data_size - au->data_bit_padding) {
av_log(avctx, AV_LOG_ERROR, "Access unit too large: "
- "%zu < %zu.\n", *data_len,
+ "%"SIZE_SPECIFIER" < %"SIZE_SPECIFIER".\n", *data_len,
8 * au->data_size - au->data_bit_padding);
return AVERROR(ENOSPC);
}
--
2.49.1
>From 1bb6216a1adaa6daef9f29f65d343c174bb02abd Mon Sep 17 00:00:00 2001
From: Jamaika1 <lukaszcz18@wp.pl>
Date: Wed, 3 Sep 2025 08:50:07 +0000
Subject: [PATCH 4/9] Fix: change integer %zu
---
libavcodec/ffv1enc_vulkan.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/libavcodec/ffv1enc_vulkan.c b/libavcodec/ffv1enc_vulkan.c
index 259bc75d4c..eae856197c 100644
--- a/libavcodec/ffv1enc_vulkan.c
+++ b/libavcodec/ffv1enc_vulkan.c
@@ -1557,14 +1557,14 @@ static av_cold int vulkan_encode_ffv1_init(AVCodecContext *avctx)
maxsize = ff_ffv1_encode_buffer_size(avctx);
if (maxsize > fv->s.props_11.maxMemoryAllocationSize) {
- av_log(avctx, AV_LOG_WARNING, "Encoding buffer size (%zu) larger "
- "than maximum device allocation (%zu), clipping\n",
+ av_log(avctx, AV_LOG_WARNING, "Encoding buffer size (%"SIZE_SPECIFIER") larger "
+ "than maximum device allocation (%"SIZE_SPECIFIER"), clipping\n",
maxsize, fv->s.props_11.maxMemoryAllocationSize);
maxsize = fv->s.props_11.maxMemoryAllocationSize;
}
if (max_heap_size < maxsize) {
- av_log(avctx, AV_LOG_WARNING, "Encoding buffer (%zu) larger than VRAM (%zu), "
+ av_log(avctx, AV_LOG_WARNING, "Encoding buffer (%"SIZE_SPECIFIER") larger than VRAM (%"SIZE_SPECIFIER"), "
"using host memory (slower)\n",
maxsize, fv->max_heap_size);
@@ -1575,7 +1575,7 @@ static av_cold int vulkan_encode_ffv1_init(AVCodecContext *avctx)
max_heap_size = max_heap_size - (max_heap_size >> 3);
}
- av_log(avctx, AV_LOG_INFO, "Async buffers: %zuMiB per context, %zuMiB total, depth: %i\n",
+ av_log(avctx, AV_LOG_INFO, "Async buffers: %"SIZE_SPECIFIER"MiB per context, %"SIZE_SPECIFIER"MiB total, depth: %i\n",
maxsize / (1024*1024),
(fv->async_depth * maxsize) / (1024*1024),
fv->async_depth);
--
2.49.1
>From 487bf83a9655c9095df2ed7289fdc7040a354036 Mon Sep 17 00:00:00 2001
From: Jamaika1 <lukaszcz18@wp.pl>
Date: Wed, 3 Sep 2025 08:52:38 +0000
Subject: [PATCH 5/9] Fix: change integer %zu
---
libavfilter/vf_tiltandshift.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavfilter/vf_tiltandshift.c b/libavfilter/vf_tiltandshift.c
index d7bce064bb..cd4e031630 100644
--- a/libavfilter/vf_tiltandshift.c
+++ b/libavfilter/vf_tiltandshift.c
@@ -266,7 +266,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
// load up enough frames to fill a frame and keep the queue filled on subsequent
// calls, until we receive EOF, and then we either pad or end
if (!s->eof_recv && s->input_size < outlink->w - s->pad) {
- av_log(ctx, AV_LOG_DEBUG, "Not enough frames in the list (%zu/%d), waiting for more.\n", s->input_size, outlink->w - s->pad);
+ av_log(ctx, AV_LOG_DEBUG, "Not enough frames in the list (%"SIZE_SPECIFIER"/%d), waiting for more.\n", s->input_size, outlink->w - s->pad);
return 0;
}
@@ -294,7 +294,7 @@ static int request_frame(AVFilterLink *outlink)
if (s->eof_recv) {
while (s->input_size) {
- av_log(ctx, AV_LOG_DEBUG, "Emptying buffers (%zu/%d).\n", s->input_size, outlink->w - s->pad);
+ av_log(ctx, AV_LOG_DEBUG, "Emptying buffers (%"SIZE_SPECIFIER"/%d).\n", s->input_size, outlink->w - s->pad);
ret = output_frame(outlink);
if (ret < 0) {
return ret;
--
2.49.1
>From 36757e022cf1653fb4a4a551844cdd954a3eac29 Mon Sep 17 00:00:00 2001
From: Jamaika1 <lukaszcz18@wp.pl>
Date: Wed, 3 Sep 2025 08:54:42 +0000
Subject: [PATCH 6/9] Fix: change integer %zu
---
libavformat/argo_cvg.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavformat/argo_cvg.c b/libavformat/argo_cvg.c
index 03ae6fa59e..d4b08d4b2e 100644
--- a/libavformat/argo_cvg.c
+++ b/libavformat/argo_cvg.c
@@ -350,7 +350,7 @@ static int argo_cvg_write_trailer(AVFormatContext *s)
+ ((ctx->size>>16) & 255)
+ (ctx->size>>24);
- av_log(s, AV_LOG_TRACE, "size = %zu\n", ctx->size);
+ av_log(s, AV_LOG_TRACE, "size = %"SIZE_SPECIFIER"\n", ctx->size);
av_log(s, AV_LOG_TRACE, "checksum = %u\n", ctx->checksum);
avio_wl32(s->pb, ctx->checksum);
--
2.49.1
>From c31cbb60e287754e6ddb83915f4b9adeed91ea1f Mon Sep 17 00:00:00 2001
From: Jamaika1 <lukaszcz18@wp.pl>
Date: Wed, 3 Sep 2025 08:57:37 +0000
Subject: [PATCH 7/9] Fix: change integer %zu
---
libavformat/ipfsgateway.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/libavformat/ipfsgateway.c b/libavformat/ipfsgateway.c
index 4699b8c3d7..5dc81f5cc6 100644
--- a/libavformat/ipfsgateway.c
+++ b/libavformat/ipfsgateway.c
@@ -70,7 +70,7 @@ static int populate_ipfs_gateway(URLContext *h)
av_log(h, AV_LOG_WARNING,
"The IPFS_GATEWAY environment variable "
"exceeds the maximum length. "
- "We allow a max of %zu characters\n",
+ "We allow a max of %"SIZE_SPECIFIER" characters\n",
sizeof(c->gateway_buffer));
ret = AVERROR(EINVAL);
goto err;
@@ -105,7 +105,7 @@ static int populate_ipfs_gateway(URLContext *h)
if (printed >= sizeof(ipfs_full_data_folder)) {
av_log(h, AV_LOG_WARNING,
"The IPFS data path exceeds the "
- "max path length (%zu)\n",
+ "max path length (%"SIZE_SPECIFIER")\n",
sizeof(ipfs_full_data_folder));
ret = AVERROR(EINVAL);
goto err;
@@ -133,7 +133,7 @@ static int populate_ipfs_gateway(URLContext *h)
av_log(h, AV_LOG_WARNING,
"The IPFS_PATH environment variable "
"exceeds the maximum length. "
- "We allow a max of %zu characters\n",
+ "We allow a max of %"SIZE_SPECIFIER" characters\n",
sizeof(c->gateway_buffer));
ret = AVERROR(EINVAL);
goto err;
@@ -146,7 +146,7 @@ static int populate_ipfs_gateway(URLContext *h)
>= sizeof(ipfs_gateway_file)) {
av_log(h, AV_LOG_WARNING,
"The IPFS gateway file path exceeds "
- "the max path length (%zu)\n",
+ "the max path length (%"SIZE_SPECIFIER")\n",
sizeof(ipfs_gateway_file));
ret = AVERROR(ENOENT);
goto err;
@@ -231,7 +231,7 @@ static int translate_ipfs_to_http(URLContext *h, const char *uri, int flags, AVD
>= sizeof(c->gateway_buffer)) {
av_log(h, AV_LOG_WARNING,
"The -gateway parameter is too long. "
- "We allow a max of %zu characters\n",
+ "We allow a max of %"SIZE_SPECIFIER" characters\n",
sizeof(c->gateway_buffer));
ret = AVERROR(EINVAL);
goto err;
--
2.49.1
>From 77e03a329553b49792851247b7db5bc551e733e9 Mon Sep 17 00:00:00 2001
From: Jamaika1 <lukaszcz18@wp.pl>
Date: Wed, 3 Sep 2025 09:00:00 +0000
Subject: [PATCH 8/9] Fix: change integer %zu
---
libavutil/vulkan.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavutil/vulkan.c b/libavutil/vulkan.c
index ef755ad6f7..44fdc01fb0 100644
--- a/libavutil/vulkan.c
+++ b/libavutil/vulkan.c
@@ -2279,7 +2279,7 @@ static int create_shader_object(FFVulkanContext *s, FFVulkanShader *shd,
if (vk->GetShaderBinaryDataEXT(s->hwctx->act_dev, shd->object,
&shader_size, NULL) == VK_SUCCESS)
- av_log(s, AV_LOG_VERBOSE, "Shader %s size: %zu binary (%zu SPIR-V)\n",
+ av_log(s, AV_LOG_VERBOSE, "Shader %s size: %"SIZE_SPECIFIER" binary (%"SIZE_SPECIFIER" SPIR-V)\n",
shd->name, shader_size, spirv_len);
return 0;
--
2.49.1
>From 608d4499ec57790823fb3af9b91123057107e259 Mon Sep 17 00:00:00 2001
From: Jamaika1 <lukaszcz18@wp.pl>
Date: Wed, 3 Sep 2025 09:05:09 +0000
Subject: [PATCH 9/9] Double filters.h removed
---
libavfilter/vsrc_testsrc.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/libavfilter/vsrc_testsrc.c b/libavfilter/vsrc_testsrc.c
index 23ecb5bdb2..3fb00d8687 100644
--- a/libavfilter/vsrc_testsrc.c
+++ b/libavfilter/vsrc_testsrc.c
@@ -46,7 +46,6 @@
#include "avfilter.h"
#include "drawutils.h"
#include "filters.h"
-#include "filters.h"
#include "formats.h"
#include "video.h"
--
2.49.1
_______________________________________________
ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org
To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org
reply other threads:[~2025-09-03 9:06 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=175689034583.25.4640811126560912483@463a07221176 \
--to=ffmpeg-devel@ffmpeg.org \
--cc=code@ffmpeg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git