From 072e1d6847678a58f00655b6ce4a854d840a5b1b Mon Sep 17 00:00:00 2001
From: jojo61 <joachim.koenig@gmx.net>
Date: Fri, 14 Aug 2020 12:38:27 +0200
Subject: [PATCH] Fix vaapi for libplacebo > 87

---
 softhdcuvid.cpp | 2 +-
 video.c         | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/softhdcuvid.cpp b/softhdcuvid.cpp
index 1832c54..f6c1a7f 100644
--- a/softhdcuvid.cpp
+++ b/softhdcuvid.cpp
@@ -61,7 +61,7 @@ extern "C"
 /// vdr-plugin version number.
 /// Makefile extracts the version number for generating the file name
 /// for the distribution archive.
-static const char *const VERSION = "3.2.2"
+static const char *const VERSION = "3.2.3"
 #ifdef GIT_REV
     "-GIT" GIT_REV
 #endif
diff --git a/video.c b/video.c
index e55963f..7ddc373 100644
--- a/video.c
+++ b/video.c
@@ -152,9 +152,9 @@ typedef enum
 
 #include <va/va_drmcommon.h>
 #include <libavcodec/vaapi.h>
+#include <libdrm/drm_fourcc.h>
 #ifdef RASPI
 #include <libavutil/hwcontext_drm.h>
-#include <libdrm/drm_fourcc.h>
 #endif
 #include <libavutil/hwcontext_vaapi.h>
 #define TO_AVHW_DEVICE_CTX(x) ((AVHWDeviceContext*)x->data)
@@ -2383,6 +2383,9 @@ void generateVAAPIImage(CuvidDecoder * decoder, int index, const AVFrame * frame
                         },
                     .size = size,
                     .offset = offset,
+#if PL_API_VER > 87
+					.drm_format_mod = DRM_FORMAT_MOD_INVALID,
+#endif
                 },
         };
 
@@ -5247,6 +5250,7 @@ static void VideoEvent(void)
             FeedKeyPress("XKeySym", keynam, 0, 0, letter);
             break;
         case KeyRelease:
+        case ButtonRelease:
             break;
         case MotionNotify:
             values[0] = XCB_NONE;