This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit e7c84a8e6afc148b0b2a729db2202af29b9b243e Author: Niklas Haas <[email protected]> AuthorDate: Fri Feb 27 12:34:18 2026 +0100 Commit: Niklas Haas <[email protected]> CommitDate: Thu Mar 12 21:02:48 2026 +0000 swscale/ops_dispatch: infer destination format from SwsOpList This is now redundant. Sponsored-by: Sovereign Tech Fund Signed-off-by: Niklas Haas <[email protected]> --- libswscale/graph.c | 2 +- libswscale/ops.h | 4 ++-- libswscale/ops_dispatch.c | 9 +++++---- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/libswscale/graph.c b/libswscale/graph.c index dda23ddca2..2408fa93f8 100644 --- a/libswscale/graph.c +++ b/libswscale/graph.c @@ -608,7 +608,7 @@ static int add_convert_pass(SwsGraph *graph, const SwsFormat *src, av_log(ctx, AV_LOG_DEBUG, "Unoptimized operation list:\n"); ff_sws_op_list_print(ctx, AV_LOG_DEBUG, AV_LOG_TRACE, ops); - ret = ff_sws_compile_pass(graph, &ops, SWS_OP_FLAG_OPTIMIZE, dst, input, output); + ret = ff_sws_compile_pass(graph, &ops, SWS_OP_FLAG_OPTIMIZE, input, output); if (ret < 0) goto fail; diff --git a/libswscale/ops.h b/libswscale/ops.h index 20c9c25605..bc8e751f7b 100644 --- a/libswscale/ops.h +++ b/libswscale/ops.h @@ -225,7 +225,7 @@ typedef struct SwsOpList { SwsOp *ops; int num_ops; - /* Purely informative metadata associated with this operation list */ + /* Metadata associated with this operation list */ SwsFormat src, dst; /* Input/output plane pointer swizzle mask */ @@ -317,6 +317,6 @@ enum SwsOpCompileFlags { * Note: `ops` may be modified by this function. */ int ff_sws_compile_pass(SwsGraph *graph, SwsOpList **ops, int flags, - const SwsFormat *dst, SwsPass *input, SwsPass **output); + SwsPass *input, SwsPass **output); #endif diff --git a/libswscale/ops_dispatch.c b/libswscale/ops_dispatch.c index 37ad4fc940..7874f3c494 100644 --- a/libswscale/ops_dispatch.c +++ b/libswscale/ops_dispatch.c @@ -322,8 +322,8 @@ static int rw_pixel_bits(const SwsOp *op) return elems * size * bits; } -static int compile(SwsGraph *graph, const SwsOpList *ops, - const SwsFormat *dst, SwsPass *input, SwsPass **output) +static int compile(SwsGraph *graph, const SwsOpList *ops, SwsPass *input, + SwsPass **output) { SwsContext *ctx = graph->ctx; SwsOpPass *p = av_mallocz(sizeof(*p)); @@ -334,6 +334,7 @@ static int compile(SwsGraph *graph, const SwsOpList *ops, if (ret < 0) goto fail; + const SwsFormat *dst = &ops->dst; if (p->comp.opaque) { SwsCompiledOp c = p->comp; av_free(p); @@ -370,7 +371,7 @@ fail: } int ff_sws_compile_pass(SwsGraph *graph, SwsOpList **pops, int flags, - const SwsFormat *dst, SwsPass *input, SwsPass **output) + SwsPass *input, SwsPass **output) { SwsContext *ctx = graph->ctx; SwsOpList *ops = *pops; @@ -397,7 +398,7 @@ int ff_sws_compile_pass(SwsGraph *graph, SwsOpList **pops, int flags, goto out; } - ret = compile(graph, ops, dst, input, output); + ret = compile(graph, ops, input, output); out: ff_sws_op_list_free(&ops); _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
