shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "better-hw-compatibility: fix out of bounds access"

--- a/vp9/encoder/vp9_rdopt.c

+++ b/vp9/encoder/vp9_rdopt.c

@@ -3939,7 +3939,8 @@

 #if CONFIG_BETTER_HW_COMPATIBILITY

     // forbid 8X4 and 4X8 partitions if any reference frame is scaled.

     if (bsize == BLOCK_8X4 || bsize == BLOCK_4X8) {

-      int ref_scaled = vp9_is_scaled(&cm->frame_refs[ref_frame - 1].sf);

+      int ref_scaled = ref_frame > INTRA_FRAME &&

+                       vp9_is_scaled(&cm->frame_refs[ref_frame - 1].sf);

       if (second_ref_frame > INTRA_FRAME)

         ref_scaled += vp9_is_scaled(&cm->frame_refs[second_ref_frame - 1].sf);

       if (ref_scaled) continue;