This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit 334356748240506ce82648a41ecf3b5d121e3e8b Author: Andreas Rheinhardt <[email protected]> AuthorDate: Tue Feb 24 01:48:31 2026 +0100 Commit: Andreas Rheinhardt <[email protected]> CommitDate: Tue Mar 10 13:52:19 2026 +0100 avcodec/motion_est: Fix shadowing Signed-off-by: Andreas Rheinhardt <[email protected]> --- libavcodec/motion_est.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c index 8ca6f16a7c..894fa85576 100644 --- a/libavcodec/motion_est.c +++ b/libavcodec/motion_est.c @@ -702,15 +702,11 @@ static inline int h263_mv4_search(MPVEncContext *const s, int mx, int my, int sh } if(c->avctx->mb_cmp&FF_CMP_CHROMA){ - int dxy; - int mx, my; - int offset; + int mx_chroma = ff_h263_round_chroma(mx4_sum); + int my_chroma = ff_h263_round_chroma(my4_sum); + int dxy = ((my_chroma & 1) << 1) | (mx_chroma & 1); - mx= ff_h263_round_chroma(mx4_sum); - my= ff_h263_round_chroma(my4_sum); - dxy = ((my & 1) << 1) | (mx & 1); - - offset = (s->c.mb_x*8 + (mx>>1)) + (s->c.mb_y*8 + (my>>1))*s->c.uvlinesize; + int offset = (s->c.mb_x*8 + (mx_chroma>>1)) + (s->c.mb_y*8 + (my_chroma>>1))*s->c.uvlinesize; c->hpel_put[1][dxy](c->scratchpad , s->c.last_pic.data[1] + offset, s->c.uvlinesize, 8); c->hpel_put[1][dxy](c->scratchpad + 8, s->c.last_pic.data[2] + offset, s->c.uvlinesize, 8); _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
