From 7238f8f99d1d123d28335dc152b1257b4fdc5113 Mon Sep 17 00:00:00 2001
From: Koichiro Iwao <meta@vmeta.jp>
Date: Mon, 26 Aug 2024 18:18:08 +0900
Subject: [PATCH] Introduce XRDP_H264 macro to indicate any H264 encoder
 enabled

---
 xrdp/xrdp.h    | 8 ++++++++
 xrdp/xrdp_mm.c | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/xrdp/xrdp.h b/xrdp/xrdp.h
index 32286f9b..c40557eb 100644
--- a/xrdp/xrdp.h
+++ b/xrdp/xrdp.h
@@ -38,6 +38,14 @@
 #include "xrdp_client_info.h"
 #include "log.h"
 
+#if defined(XRDP_X264) || defined(XRDP_OPENH264) || defined(XRDP_NVENC)
+#if !defined(XRDP_H264)
+#define XRDP_H264 1
+#endif
+#else
+#undef XRDP_H264
+#endif
+
 /* xrdp.c */
 long
 g_xrdp_sync(long (*sync_func)(long param1, long param2), long sync_param1,
diff --git a/xrdp/xrdp_mm.c b/xrdp/xrdp_mm.c
index 16549464..a22f2f19 100644
--- a/xrdp/xrdp_mm.c
+++ b/xrdp/xrdp_mm.c
@@ -1440,7 +1440,7 @@ xrdp_mm_egfx_caps_advertise(void *user, int caps_count,
     /* prefer h264, todo use setting in xrdp.ini for this */
     if (best_h264_index >= 0)
     {
-#if defined(XRDP_X264) || defined(XRDP_NVENC)
+#if defined(XRDP_H264)
         best_index = best_h264_index;
         self->egfx_flags = XRDP_EGFX_H264;
 #endif