The branch, master has been updated
via a4fd3f27f4d911e807f9c45931a5fd5d3ae95c87 (commit)
via c74ee4ceffe2bfb5ac65852903d72720a79dda18 (commit)
from 6384254db203bea90b57b0f4dd8f32726a22a249 (commit)
- Log -----------------------------------------------------------------
commit a4fd3f27f4d911e807f9c45931a5fd5d3ae95c87
Author: Andreas Rheinhardt <andreas.rheinha...@outlook.com>
AuthorDate: Fri Sep 12 20:55:24 2025 +0200
Commit: Andreas Rheinhardt <andreas.rheinha...@outlook.com>
CommitDate: Fri Sep 12 22:42:30 2025 +0200
swscale/x86/ops: Fix leak
Reviewed-by: Niklas Haas <ffm...@haasn.dev>
Signed-off-by: Andreas Rheinhardt <andreas.rheinha...@outlook.com>
diff --git a/libswscale/x86/ops.c b/libswscale/x86/ops.c
index 3b5a060f64..82a6d233b9 100644
--- a/libswscale/x86/ops.c
+++ b/libswscale/x86/ops.c
@@ -206,7 +206,7 @@ static int setup_dither(const SwsOp *op, SwsOpPriv *out)
DECL_COMMON_PATTERNS(F32, dither##SIZE##EXT,
\
.op = SWS_OP_DITHER,
\
.setup = setup_dither,
\
- .free = SIZE > 2 ? av_free : NULL,
\
+ .free = (1 << SIZE) > 2 ? av_free : NULL,
\
.dither_size = SIZE,
\
);
commit c74ee4ceffe2bfb5ac65852903d72720a79dda18
Author: Andreas Rheinhardt <andreas.rheinha...@outlook.com>
AuthorDate: Fri Sep 12 20:47:57 2025 +0200
Commit: Andreas Rheinhardt <andreas.rheinha...@outlook.com>
CommitDate: Fri Sep 12 22:41:24 2025 +0200
swscale/ops_chain: Free correct pointer on error
Reviewed-by: Niklas Haas <ffm...@haasn.dev>
Signed-off-by: Andreas Rheinhardt <andreas.rheinha...@outlook.com>
diff --git a/libswscale/ops_chain.c b/libswscale/ops_chain.c
index 80162507b0..ef768b4904 100644
--- a/libswscale/ops_chain.c
+++ b/libswscale/ops_chain.c
@@ -234,7 +234,7 @@ int ff_sws_op_compile_tables(const SwsOpTable *const
tables[], int num_tables,
ret = ff_sws_op_chain_append(chain, best->func, best->free, &priv);
if (ret < 0) {
if (best->free)
- best->free(&priv);
+ best->free(priv.ptr);
return ret;
}
-----------------------------------------------------------------------
Summary of changes:
libswscale/ops_chain.c | 2 +-
libswscale/x86/ops.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
_______________________________________________
ffmpeg-cvslog mailing list -- ffmpeg-cvslog@ffmpeg.org
To unsubscribe send an email to ffmpeg-cvslog-le...@ffmpeg.org
