A small cleanup on LOWDELAY_COMPOUND

BUG=aomedia:442

Change-Id: I98ada843016d0dd046f89bbcb2e9ae72442a101e

av1/encoder/encodeframe.c

diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index 1bd5b44..ec242dc 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -5413,29 +5413,15 @@
   // side behavior is where the ALT ref buffer has opposite sign bias to
   // the other two.
   if (!frame_is_intra_only(cm)) {
-#if CONFIG_LOWDELAY_COMPOUND  // Normative in encoder
-    cpi->allow_comp_inter_inter = 1;
-#if CONFIG_EXT_REFS
-    cm->comp_fwd_ref[0] = LAST_FRAME;
-    cm->comp_fwd_ref[1] = LAST2_FRAME;
-    cm->comp_fwd_ref[2] = LAST3_FRAME;
-    cm->comp_fwd_ref[3] = GOLDEN_FRAME;
-    cm->comp_bwd_ref[0] = BWDREF_FRAME;
-    cm->comp_bwd_ref[1] = ALTREF_FRAME;
-#else
-    cm->comp_fixed_ref = ALTREF_FRAME;
-    cm->comp_var_ref[0] = LAST_FRAME;
-    cm->comp_var_ref[1] = GOLDEN_FRAME;
-#endif  // CONFIG_EXT_REFS
-#else
+#if !CONFIG_LOWDELAY_COMPOUND
     if ((cm->ref_frame_sign_bias[ALTREF_FRAME] ==
          cm->ref_frame_sign_bias[GOLDEN_FRAME]) ||
         (cm->ref_frame_sign_bias[ALTREF_FRAME] ==
          cm->ref_frame_sign_bias[LAST_FRAME])) {
       cpi->allow_comp_inter_inter = 0;
     } else {
+#endif
       cpi->allow_comp_inter_inter = 1;
-
 #if CONFIG_EXT_REFS
       cm->comp_fwd_ref[0] = LAST_FRAME;
       cm->comp_fwd_ref[1] = LAST2_FRAME;
@@ -5444,10 +5430,11 @@
       cm->comp_bwd_ref[0] = BWDREF_FRAME;
       cm->comp_bwd_ref[1] = ALTREF_FRAME;
 #else
-      cm->comp_fixed_ref = ALTREF_FRAME;
-      cm->comp_var_ref[0] = LAST_FRAME;
-      cm->comp_var_ref[1] = GOLDEN_FRAME;
-#endif  // CONFIG_EXT_REFS
+    cm->comp_fixed_ref = ALTREF_FRAME;
+    cm->comp_var_ref[0] = LAST_FRAME;
+    cm->comp_var_ref[1] = GOLDEN_FRAME;
+#endif                         // CONFIG_EXT_REFS
+#if !CONFIG_LOWDELAY_COMPOUND  // Normative in encoder
     }
 #endif
   } else {