This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit 91e76dc766f2ffae1ccf552656ae5c087cb73cf6 Author: Niklas Haas <[email protected]> AuthorDate: Sun Mar 15 12:37:08 2026 +0100 Commit: Niklas Haas <[email protected]> CommitDate: Wed Mar 18 09:09:44 2026 +0000 swscale/ops_dispatch: remove slice_align hack Added in commit 00907e1244ef3de to hack around a problem that was caused by the Vulkan backend's incorrect use of the ops dispatch code, which was fixed properly in commit 143cb5650123. This logic never made sense to begin with, it was only meant to disable the memcpy logic for Vulkan specifically. Sponsored-by: Sovereign Tech Fund Signed-off-by: Niklas Haas <[email protected]> --- libswscale/ops_dispatch.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libswscale/ops_dispatch.c b/libswscale/ops_dispatch.c index 239b2e3d7b..713b34b86b 100644 --- a/libswscale/ops_dispatch.c +++ b/libswscale/ops_dispatch.c @@ -152,8 +152,7 @@ static int op_pass_setup(const SwsFrame *out, const SwsFrame *in, const int plane_w = (aligned_w + sub_x) >> sub_x; const int plane_pad = (comp->over_read + sub_x) >> sub_x; const int plane_size = plane_w * p->pixel_bits_in >> 3; - if (comp->slice_align) - p->memcpy_in |= plane_size + plane_pad > in->linesize[idx]; + p->memcpy_in |= plane_size + plane_pad > in->linesize[idx]; exec->in[i] = in->data[idx]; exec->in_stride[i] = in->linesize[idx]; exec->in_sub_y[i] = sub_y; @@ -168,8 +167,7 @@ static int op_pass_setup(const SwsFrame *out, const SwsFrame *in, const int plane_w = (aligned_w + sub_x) >> sub_x; const int plane_pad = (comp->over_write + sub_x) >> sub_x; const int plane_size = plane_w * p->pixel_bits_out >> 3; - if (comp->slice_align) - p->memcpy_out |= plane_size + plane_pad > out->linesize[idx]; + p->memcpy_out |= plane_size + plane_pad > out->linesize[idx]; exec->out[i] = out->data[idx]; exec->out_stride[i] = out->linesize[idx]; exec->out_sub_y[i] = sub_y; _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
