From c6050a7846512b31cd995ef9a96be8e8cbf15587 Mon Sep 17 00:00:00 2001
From: Vincent Rabaud <vrabaud@google.com>
Date: Wed, 9 Oct 2024 11:41:56 +0200
Subject: [PATCH] Add more fixes

---
 cmake/Modules/LocalAom.cmake | 2 ++
 src/obu.c                    | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cmake/Modules/LocalAom.cmake b/cmake/Modules/LocalAom.cmake
index d081734c27..ccae510c76 100644
--- a/cmake/Modules/LocalAom.cmake
+++ b/cmake/Modules/LocalAom.cmake
@@ -100,6 +100,8 @@ else()
             PATCH_COMMAND sed -i CMakeLists.txt -e "s:CMAKE_CURRENT_BINARY_DIR\}/flatbuffers:CMAKE_BINARY_DIR\}/flatbuffers:"
             UPDATE_COMMAND ""
         )
+        # This will disable the tensorflow dependency.
+        set(CONFIG_ML_PART_SPLIT 0 CACHE INTERNAL "")
     else()
         FetchContent_Declare(
             libaom URL "https://aomedia.googlesource.com/aom/+archive/${AVIF_LOCAL_AOM_GIT_TAG}.tar.gz" BINARY_DIR
diff --git a/src/obu.c b/src/obu.c
index 9783a4ff0e..4c8e3ef7cb 100644
--- a/src/obu.c
+++ b/src/obu.c
@@ -372,9 +372,7 @@ static avifBool parseAV2SequenceHeader(avifBits * bits, avifSequenceHeader * hea
 
     // See av1_read_sequence_header() in avm.
     AVIF_CHECK(parseSequenceHeaderFrameMaxDimensions(bits, header));
-#if CONFIG_BLOCK_256
     if (!avifBitsRead(bits, 1)) // BLOCK_256X256
-#endif
         avifBitsRead(bits, 1); // BLOCK_128X128
     AVIF_CHECK(parseSequenceHeaderEnabledFeatures(bits, header));