From e652233d4d4410573b7120b0072ad1afc2e01517 Mon Sep 17 00:00:00 2001
From: eumagga0x2a <eumagga0x2a@users.noreply.github.com>
Date: Sat, 9 Mar 2024 12:25:13 +0100
Subject: [PATCH] [av1aom] Fix tiling

The typos missed by reviewer resulted in maximum column and row count of 2.
---
 avidemux_plugins/ADM_videoEncoder/av1aom/ADM_av1AomEnc.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/avidemux_plugins/ADM_videoEncoder/av1aom/ADM_av1AomEnc.cpp b/avidemux_plugins/ADM_videoEncoder/av1aom/ADM_av1AomEnc.cpp
index 7689a79b1..d884d58d6 100644
--- a/avidemux_plugins/ADM_videoEncoder/av1aom/ADM_av1AomEnc.cpp
+++ b/avidemux_plugins/ADM_videoEncoder/av1aom/ADM_av1AomEnc.cpp
@@ -392,12 +392,12 @@ bool av1AomEncoder::setup(void)
     {
         ADM_warning("[av1aom] Cannot set AV1E_SET_COLOR_RANGE codec control to %d\n", encoderSettings.fullrange);
     }
-    unsigned int colCount = ((encoderSettings.tiling >> 0) && 0xFFFF);
+    unsigned int colCount = ((encoderSettings.tiling >> 0) & 0xFFFF);
     if(AOM_CODEC_OK != aom_codec_control(&context, AV1E_SET_TILE_COLUMNS, colCount))
     {
         ADM_warning("[av1aom] Cannot set AV1E_SET_TILE_COLUMNS codec control to %u\n", colCount);
     }
-    unsigned int rowCount = ((encoderSettings.tiling >> 16) && 0xFFFF);
+    unsigned int rowCount = ((encoderSettings.tiling >> 16) & 0xFFFF);
     if(AOM_CODEC_OK != aom_codec_control(&context, AV1E_SET_TILE_ROWS, rowCount))
     {
         ADM_warning("[av1aom] Cannot set AV1E_SET_TILE_ROWS codec control to %u\n", rowCount);