From 1d1d94a37a56575b73b1124a579e9896fb68962f Mon Sep 17 00:00:00 2001 From: Vincent Rabaud Date: Fri, 12 Jan 2024 13:39:53 +0100 Subject: [PATCH] Fix AVM header parsing for good --- src/obu.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/obu.c b/src/obu.c index 9389e9d5bb..e05b5ca2da 100644 --- a/src/obu.c +++ b/src/obu.c @@ -379,9 +379,10 @@ static avifBool parseAV2SequenceHeader(avifBits * bits, avifSequenceHeader * hea avifBitsRead(bits, 2); // enable_superres, enable_cdef if (avifBitsRead(bits, 1)) { // enable_restoration #if CONFIG_LR_IMPROVEMENTS - avifBitsRead(bits, /*RESTORE_SWITCHABLE_TYPES=*/5); // lr_tools_disable_mask[0] + const int lr_tools_disable_mask_length = /*RESTORE_SWITCHABLE_TYPES=*/5 - 1; + avifBitsRead(bits, lr_tools_disable_mask_length); // lr_tools_disable_mask[0] if (avifBitsRead(bits, 1)) { - avifBitsRead(bits, /*RESTORE_SWITCHABLE_TYPES=*/5 - 1 - 1); // lr_tools_disable_mask[1] + avifBitsRead(bits, lr_tools_disable_mask_length - 1); // lr_tools_disable_mask[1] } #endif }