From 7afeaebb5cc22eb4f4512d8aa0cf4e835e7a2daf Mon Sep 17 00:00:00 2001
From: LisoUseInAIKyrios <118716522+LisoUseInAIKyrios@users.noreply.github.com>
Date: Wed, 8 Oct 2025 00:34:45 +0400
Subject: [PATCH] fix(YouTube - Spoof video streams): Do not allow VR AV1 if
 "Force AVC" is enabled

---
 .../youtube/patches/spoof/SpoofVideoStreamsPatch.java       | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/spoof/SpoofVideoStreamsPatch.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/spoof/SpoofVideoStreamsPatch.java
index eaf2f3e14b..ef8069e855 100644
--- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/spoof/SpoofVideoStreamsPatch.java
+++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/spoof/SpoofVideoStreamsPatch.java
@@ -29,7 +29,11 @@ public class SpoofVideoStreamsPatch {
     public static void setClientOrderToUse() {
         ClientType client = Settings.SPOOF_VIDEO_STREAMS_CLIENT_TYPE.get();
 
-        if (client == ANDROID_VR_1_43_32 && Settings.SPOOF_VIDEO_STREAMS_AV1.get()) {
+        // Use VR 1.61 client that has AV1 if user settings allow it.
+        // AVC cannot be forced with VR 1.61 because it uses VP9 and AV1.
+        // If both settings are on, then force AVC takes priority and VR 1.43 is used.
+        if (client == ANDROID_VR_1_43_32 && Settings.SPOOF_VIDEO_STREAMS_AV1.get()
+                && !Settings.FORCE_AVC_CODEC.get()) {
             client = ANDROID_VR_1_61_48;
         }