[FFmpeg-cvslog] avcodec/rv60: loosen fill_mv_skip_cand top right and bottom left criteria

[Peter Ross]

ffmpeg | branch: master | Peter Ross <pross at xvid.org> | Sat Nov 16 19:08:39 2024 +1100| [566b737a7a7a45dd0c91f25ae420599021d57760] | committer: Peter Ross

avcodec/rv60: loosen fill_mv_skip_cand top right and bottom left criteria

Fixes ticket #11293.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=566b737a7a7a45dd0c91f25ae420599021d57760
---

 libavcodec/rv60dec.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/rv60dec.c b/libavcodec/rv60dec.c
index 091018cc56..19cd0f2861 100644
--- a/libavcodec/rv60dec.c
+++ b/libavcodec/rv60dec.c
@@ -881,12 +881,12 @@ static void fill_mv_skip_cand(RV60Context * s, const CUContext * cu, unique_list
         if (mvinfo_valid(mv))
             unique_list_mvinfo_add(skip_cand, *mv);
     }
-    if (has_top_right_block(s, cu->xpos, cu->ypos, 0, 0, size)) {
+    if (cu->ypos > 0 && cu->xpos + size < s->awidth) {
         const MVInfo * mv = &s->blk_info[cu->blk_pos - s->blk_stride + mv_size].mv;
         if (mvinfo_valid(mv))
             unique_list_mvinfo_add(skip_cand, *mv);
     }
-    if (has_left_down_block(s, cu->xpos, cu->ypos, 0, 0, size)) {
+    if (cu->xpos > 0 && cu->ypos + size < s->aheight) {
         const MVInfo * mv = &s->blk_info[cu->blk_pos + s->blk_stride * mv_size - 1].mv;
         if (mvinfo_valid(mv))
             unique_list_mvinfo_add(skip_cand, *mv);