Add more fixes

AOMediaCodec · Oct 9, 2024 · c6050a7 · c6050a7
1 parent 3a4b4b4
commit c6050a7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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));