This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit bd9590db701259f84ed712bc46868c60ed7502a9 Author: Niklas Haas <[email protected]> AuthorDate: Sat Mar 7 01:42:53 2026 +0100 Commit: Niklas Haas <[email protected]> CommitDate: Mon Mar 9 12:01:51 2026 +0100 swscale/ops_dispatch: remove unnecessary SwsOpExec fields These were abstraction-violating in the first place. Good riddance. This partially reverts commit c911295f096c8dcf0dc29239d0915ce92f2454b5. Signed-off-by: Niklas Haas <[email protected]> --- libswscale/ops_dispatch.c | 3 --- libswscale/ops_dispatch.h | 7 +------ libswscale/x86/ops_common.asm | 2 -- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/libswscale/ops_dispatch.c b/libswscale/ops_dispatch.c index dd52806750..7046e3956e 100644 --- a/libswscale/ops_dispatch.c +++ b/libswscale/ops_dispatch.c @@ -180,9 +180,6 @@ static void op_pass_setup(const SwsFrame *out, const SwsFrame *in, exec->in_bump[i] = exec->in_stride[i] - blocks_main * exec->block_size_in; exec->out_bump[i] = exec->out_stride[i] - blocks_main * exec->block_size_out; } - - exec->in_frame = in; - exec->out_frame = out; } /* Dispatch kernel over the last column of the image using memcpy */ diff --git a/libswscale/ops_dispatch.h b/libswscale/ops_dispatch.h index c2171a406e..ebbd1f68e7 100644 --- a/libswscale/ops_dispatch.h +++ b/libswscale/ops_dispatch.h @@ -54,16 +54,11 @@ typedef struct SwsOpExec { /* Subsampling factors for each plane */ uint8_t in_sub_y[4], out_sub_y[4]; uint8_t in_sub_x[4], out_sub_x[4]; - - /* Pointers back to the original SwsFrame */ - const SwsFrame *in_frame; - const SwsFrame *out_frame; } SwsOpExec; static_assert(sizeof(SwsOpExec) == 24 * sizeof(void *) + 6 * sizeof(int32_t) + - 16 * sizeof(uint8_t) + - 2 * sizeof(void *), + 16 * sizeof(uint8_t), "SwsOpExec layout mismatch"); /** diff --git a/libswscale/x86/ops_common.asm b/libswscale/x86/ops_common.asm index 6da33448f8..e19bd84a8e 100644 --- a/libswscale/x86/ops_common.asm +++ b/libswscale/x86/ops_common.asm @@ -141,8 +141,6 @@ struc SwsOpExec .out_sub_y4 resb 4 .in_sub_x4 resb 4 .out_sub_x4 resb 4 - .in_hwframe_ref resq 1 - .out_hwframe_ref resq 1 endstruc struc SwsOpImpl _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
