Commit e73b26b9db for aom

commit e73b26b9dbc41192662dc552bc07e2ed8f61db28
Author: Yunqing Wang <yunqingwang@google.com>
Date:   Mon Mar 2 08:53:15 2026 -0800

    Revert "Fix frame parallel encode failure"

    This reverts commit c2b223c888cd7994356f185f638bacaeb98fc93e.

    Reason for revert: This is not the cause of the failure.

    Bug: 487328945
    Change-Id: I75cf6eff893d64288e5dfc2cc9268f09ba7e438a

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 0905b2bdbe..dde46f697f 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -6257,13 +6257,6 @@ void av1_rd_pick_inter_mode(struct AV1_COMP *cpi, struct TileDataEnc *tile_data,

     txfm_info->skip_txfm = 0;
     sf_args.num_single_modes_processed += is_single_pred;
-
-    const bool optimized_init = !cpi->oxcf.fp_mt;
-    if (!optimized_init) {
-      init_mbmi(mbmi, this_mode, ref_frames, cm);
-      set_ref_ptrs(cm, xd, ref_frame, second_ref_frame);
-    }
-
 #if CONFIG_COLLECT_COMPONENT_TIMING
     start_timing(cpi, skip_inter_mode_time);
 #endif
@@ -6275,10 +6268,8 @@ void av1_rd_pick_inter_mode(struct AV1_COMP *cpi, struct TileDataEnc *tile_data,
 #endif
     if (is_skip_inter_mode) continue;

-    if (optimized_init) {
-      init_mbmi(mbmi, this_mode, ref_frames, cm);
-      set_ref_ptrs(cm, xd, ref_frame, second_ref_frame);
-    }
+    init_mbmi(mbmi, this_mode, ref_frames, cm);
+    set_ref_ptrs(cm, xd, ref_frame, second_ref_frame);

     // Select prediction reference frames.
     for (i = 0; i < num_planes; i++) {