From 3d1d2a5d550d8d0c6fd111e5e7ba0dddb4682d64 Mon Sep 17 00:00:00 2001
From: Romain Vimont <rom1v@videolabs.io>
Date: Wed, 1 Sep 2021 11:54:30 +0200
Subject: [PATCH] opengl: fix sampler PRIV()
The macro parameter name was the same as the member name ("sampler"). To
avoid the problem, use a static inline function instead.
---
modules/video_output/opengl/sampler.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/modules/video_output/opengl/sampler.c b/modules/video_output/opengl/sampler.c
index fdaacb99227b..8b07d96315fd 100644
--- a/modules/video_output/opengl/sampler.c
+++ b/modules/video_output/opengl/sampler.c
@@ -103,7 +103,11 @@ struct vlc_gl_sampler_priv {
unsigned plane;
};
-#define PRIV(sampler) container_of(sampler, struct vlc_gl_sampler_priv, sampler)
+static inline struct vlc_gl_sampler_priv *
+PRIV(struct vlc_gl_sampler *sampler)
+{
+ return container_of(sampler, struct vlc_gl_sampler_priv, sampler);
+}
static const float MATRIX_COLOR_RANGE_LIMITED[4*3] = {
255.0/219, 0, 0, -255.0/219 * 16.0/255,
--
GitLab