shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Remove unnecessary conditional assignment"

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

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

@@ -3259,13 +3259,10 @@

         vp9_is_scaled(&cm->frame_refs[second_ref_frame - 1].sf))

       continue;

-    if (comp_pred) {

-      mode_excluded = mode_excluded ? mode_excluded

-                                    : cm->reference_mode == SINGLE_REFERENCE;

-    } else if (ref_frame != INTRA_FRAME) {

-      mode_excluded = mode_excluded ? mode_excluded

-                                    : cm->reference_mode == COMPOUND_REFERENCE;

-    }

+    if (comp_pred)

+      mode_excluded = cm->reference_mode == SINGLE_REFERENCE;

+    else if (ref_frame != INTRA_FRAME)

+      mode_excluded = cm->reference_mode == COMPOUND_REFERENCE;

     // If the segment reference frame feature is enabled....

     // then do nothing if the current ref frame is not allowed..

-- 

⑨