From 55fb0afe8c957b7830f03d9104db50fe62de9713 Mon Sep 17 00:00:00 2001
From: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date: Mon, 31 Aug 2026 16:29:23 -0700
Subject: [PATCH] android: fix flickering and missing hardware decode setting

---
 gui/menu/menu_settings.c | 2 +-
 gui/ui/ui_sdl.c          | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/gui/menu/menu_settings.c b/gui/menu/menu_settings.c
index eb0e9d6..b2da7fe 100644
--- a/gui/menu/menu_settings.c
+++ b/gui/menu/menu_settings.c
@@ -182,7 +182,7 @@ void vpi_menu_settings(vui_context_t *vui, void *v)
     sc++;
 #endif
 
-#if defined(VANILLA_CUDA_AVAILABLE) || defined(VANILLA_DRM_AVAILABLE) || defined(VANILLA_VAAPI_AVAILABLE)
+#if defined(VANILLA_CUDA_AVAILABLE) || defined(VANILLA_DRM_AVAILABLE) || defined(VANILLA_VAAPI_AVAILABLE) || defined(ANDROID)
 #define VANILLA_HAS_HWDEC
 #endif
 
diff --git a/gui/ui/ui_sdl.c b/gui/ui/ui_sdl.c
index e74d6f7..cd92b8c 100644
--- a/gui/ui/ui_sdl.c
+++ b/gui/ui/ui_sdl.c
@@ -2203,7 +2203,6 @@ int vui_update_sdl(vui_context_t *vui)
                     SDL_DestroyTexture(sdl_ctx->game_tex);
                 }
                 sdl_ctx->game_tex = sdl_ctx->android_video_tex;
-                sdl_ctx->android_video_ready = 0;
                 if (av_mediacodec_release_buffer(buffer, 1) < 0) {
                     vpilog("Failed to render MediaCodec output buffer\n");
                     break;