From d27af08ff6b4fc6e0d651bcc7927d1f3b98f6a5b Mon Sep 17 00:00:00 2001
From: Aidan MacDonald <amachronic@protonmail.com>
Date: Wed, 23 Sep 2026 11:46:43 +0100
Subject: [PATCH] hw_h264: remove redundant ifdef guards

Change-Id: I5fa1abc1226ec5a35888713da83467a71a3c4caf
---
 apps/plugin.c                                    | 3 ---
 apps/plugin.h                                    | 2 --
 apps/plugins/h264_player/video_audio.c           | 5 -----
 apps/plugins/h264_player/video_pcm.c             | 5 -----
 apps/plugins/h264_player/video_playback.c        | 6 ------
 firmware/target/arm/s5l8702/ipod6g/vpu-h264-6g.c | 6 ------
 6 files changed, 27 deletions(-)

diff --git a/apps/plugin.c b/apps/plugin.c
index 83574d5ed0..ec42d25a61 100644
--- a/apps/plugin.c
+++ b/apps/plugin.c
@@ -49,9 +49,6 @@
 #include "language.h"
 #include "statusbar-skinned.h"
 #include "panic.h"
-#ifdef HAVE_HW_H264
-#include "hw_h264.h"
-#endif
 
 #if CONFIG_CHARGING
 #include "power.h"
diff --git a/apps/plugin.h b/apps/plugin.h
index e98c4b78a3..ab60404a3b 100644
--- a/apps/plugin.h
+++ b/apps/plugin.h
@@ -83,9 +83,7 @@ int plugin_open(const char *plugin, const char *parameter);
 #include "metadata.h"
 #include "sound.h"
 #include "audio.h"
-#ifdef HAVE_HW_H264
 #include "hw_h264.h"
-#endif
 #include "voice_thread.h"
 #include "root_menu.h"
 #include "talk.h"
diff --git a/apps/plugins/h264_player/video_audio.c b/apps/plugins/h264_player/video_audio.c
index 53c43264a4..dd6a786086 100644
--- a/apps/plugins/h264_player/video_audio.c
+++ b/apps/plugins/h264_player/video_audio.c
@@ -29,9 +29,6 @@
  */
 
 #include "plugin.h"
-
-#ifdef HAVE_HW_H264
-
 #include <stddef.h>
 
 #include "codec_thread.h"
@@ -573,5 +570,3 @@ bool video_audio_failed(void)
 {
     return audio_has_error;
 }
-
-#endif /* HAVE_HW_H264 */
diff --git a/apps/plugins/h264_player/video_pcm.c b/apps/plugins/h264_player/video_pcm.c
index fd46692bb2..82305f2e53 100644
--- a/apps/plugins/h264_player/video_pcm.c
+++ b/apps/plugins/h264_player/video_pcm.c
@@ -29,9 +29,6 @@
  */
 
 #include "plugin.h"
-
-#ifdef HAVE_HW_H264
-
 #include "system.h"
 #include "kernel.h"
 #include "pcm.h"
@@ -260,5 +257,3 @@ uint32_t video_pcm_buffered_samples(void)
 {
     return pcm_used();
 }
-
-#endif /* HAVE_HW_H264 */
diff --git a/apps/plugins/h264_player/video_playback.c b/apps/plugins/h264_player/video_playback.c
index f7f7ff73e4..b73cb7694f 100644
--- a/apps/plugins/h264_player/video_playback.c
+++ b/apps/plugins/h264_player/video_playback.c
@@ -30,9 +30,6 @@
  */
 
 #include "plugin.h"
-
-#ifdef HAVE_HW_H264
-
 #include "backlight.h"
 #include "button.h"
 #include "crc32.h"
@@ -54,7 +51,6 @@
 #include "video_audio.h"
 #include "video_pcm.h"
 #include "video_playback.h"
-#include "hw_h264.h"
 
 #include <stdint.h>
 #include <stdio.h>
@@ -1144,5 +1140,3 @@ cleanup:
         rb->cpu_boost(false);
     return result;
 }
-
-#endif /* HAVE_HW_H264 */
diff --git a/firmware/target/arm/s5l8702/ipod6g/vpu-h264-6g.c b/firmware/target/arm/s5l8702/ipod6g/vpu-h264-6g.c
index b4c5c6ea06..9410e670d0 100644
--- a/firmware/target/arm/s5l8702/ipod6g/vpu-h264-6g.c
+++ b/firmware/target/arm/s5l8702/ipod6g/vpu-h264-6g.c
@@ -19,11 +19,7 @@
  * KIND, either express or implied.
  *
  ****************************************************************************/
-
 #include "config.h"
-
-#ifdef HAVE_HW_H264
-
 #include "system.h"
 #include "kernel.h"
 #include "s5l87xx.h"
@@ -1077,5 +1073,3 @@ const struct hw_h264_api target_hw_h264_api = {
     .get_frame = vpu_h264_get_frame,
     .close = vpu_h264_close,
 };
-
-#endif /* HAVE_HW_H264 */