commit 1b93eba17431da101dd5232c395b2b22ae2fd35e
author Jerome Jiang <jianj@google.com> Wed Oct 08 11:14:28 2025 -0400
committer Jerome Jiang <jianj@google.com> Thu Oct 09 06:59:35 2025 -0700
tree 4a5eb984e1eac4639184e543b5d157df4ed9ba58
parent 4f1bb5fb954efebfe59be1eaae8354c3af6cecac

partition_strategy.c: Remove return after longjmp.

Bug: aomedia:444707595
Change-Id: I746665193cea3d477c8fd9be3be38ee99e4c1295

av1/encoder/partition_strategy.c

diff --git a/av1/encoder/partition_strategy.c b/av1/encoder/partition_strategy.c
index 4708101..a4a1f82 100644
--- a/av1/encoder/partition_strategy.c
+++ b/av1/encoder/partition_strategy.c
@@ -210,7 +210,6 @@
                                                 bit_depth, &output)) {
         aom_internal_error(xd->error_info, AOM_CODEC_MEM_ERROR,
                            "Error allocating CNN data");
-        return;
       }
     } else {
       uint8_t *image[1] = { x->plane[AOM_PLANE_Y].src.buf - stride - 1 };
@@ -219,7 +218,6 @@
                                          cnn_config, &thread_data, &output)) {
         aom_internal_error(xd->error_info, AOM_CODEC_MEM_ERROR,
                            "Error allocating CNN data");
-        return;
       }
     }
 
@@ -1773,6 +1771,7 @@
       av1_is_whole_blk_in_frame(blk_params, mi_params);
 
   if (try_intra_cnn_based_part_prune) {
+    assert(x->e_mbd.error_info->setjmp);
     intra_mode_cnn_partition(&cpi->common, x, x->part_search_info.quad_tree_idx,
                              cpi->sf.part_sf.intra_cnn_based_part_prune_level,
                              part_state);