[vlc-commits] hw: vaapi: fix caps type of vaQueryVideoProcFilterCaps

Fabrice Bellet git at videolan.org
Fri Apr 5 17:46:10 CEST 2019


vlc/vlc-3.0 | branch: master | Fabrice Bellet <fabrice at bellet.info> | Mon Mar  4 10:54:45 2019 +0100| [5fc4822aceabd4439d8743a8b788687670c38455] | committer: Jean-Baptiste Kempf

hw: vaapi: fix caps type of vaQueryVideoProcFilterCaps

Fixes #22053

Signed-off-by: Thomas Guillem <thomas at gllm.fr>
(cherry picked from commit db9131787a3cc3cada9cb855e1a201f33c14703c)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=5fc4822aceabd4439d8743a8b788687670c38455
---

 modules/hw/vaapi/filters.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/modules/hw/vaapi/filters.c b/modules/hw/vaapi/filters.c
index 4f7305b756..593203da1e 100644
--- a/modules/hw/vaapi/filters.c
+++ b/modules/hw/vaapi/filters.c
@@ -979,13 +979,13 @@ Deinterlace_Flush(filter_t *filter)
 
 static inline bool
 OpenDeinterlace_IsValidType(filter_t * filter,
-                            VAProcDeinterlacingType const caps[],
+                            VAProcFilterCapDeinterlacing const caps[],
                             unsigned int num_caps,
                             struct deint_mode const * deint_mode)
 {
     (void) filter;
     for (unsigned int j = 0; j < num_caps; ++j)
-        if (caps[j] == deint_mode->type)
+        if (caps[j].type == deint_mode->type)
             return true;
     return false;
 }
@@ -993,7 +993,7 @@ OpenDeinterlace_IsValidType(filter_t * filter,
 static inline int
 OpenDeinterlace_GetMode(filter_t * filter, char const * deint_mode,
                         struct deint_mode * p_deint_mode,
-                        VAProcDeinterlacingType const caps[],
+                        VAProcFilterCapDeinterlacing const caps[],
                         unsigned int num_caps)
 {
     bool fallback = false;
@@ -1046,7 +1046,8 @@ OpenDeinterlace_InitFilterParams(filter_t * filter, void * p_data,
 {
     struct deint_data *const    p_deint_data = p_data;
     filter_sys_t *const         filter_sys = filter->p_sys;
-    VAProcDeinterlacingType     caps[VAProcDeinterlacingCount];
+    VAProcFilterCapDeinterlacing
+                                caps[VAProcDeinterlacingCount];
     unsigned int                num_caps = VAProcDeinterlacingCount;
 
     if (vlc_vaapi_QueryVideoProcFilterCaps(VLC_OBJECT(filter),



More information about the vlc-commits mailing list