frodovdr
/
vdr-plugin-softhdcuvid
mirror of https://github.com/jojo61/vdr-plugin-softhdcuvid.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix vaapi for libplacebo > 87

This commit is contained in:
jojo61 2020-08-14 12:38:27 +02:00
parent 6c13195fda
commit 072e1d6847
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
softhdcuvid.cpp
View File

@ -61,7 +61,7 @@ extern "C"
/// vdr-plugin version number. /// vdr-plugin version number.
/// Makefile extracts the version number for generating the file name /// Makefile extracts the version number for generating the file name
/// for the distribution archive. /// for the distribution archive.
static const char *const VERSION = "3.2.2" static const char *const VERSION = "3.2.3"
#ifdef GIT_REV #ifdef GIT_REV
"-GIT" GIT_REV "-GIT" GIT_REV
#endif #endif

6
video.c
View File

@ -152,9 +152,9 @@ typedef enum
#include <va/va_drmcommon.h> #include <va/va_drmcommon.h>
#include <libavcodec/vaapi.h> #include <libavcodec/vaapi.h>
#include <libdrm/drm_fourcc.h>
#ifdef RASPI #ifdef RASPI
#include <libavutil/hwcontext_drm.h> #include <libavutil/hwcontext_drm.h>
#include <libdrm/drm_fourcc.h>
#endif #endif
#include <libavutil/hwcontext_vaapi.h> #include <libavutil/hwcontext_vaapi.h>
#define TO_AVHW_DEVICE_CTX(x) ((AVHWDeviceContext*)x->data) #define TO_AVHW_DEVICE_CTX(x) ((AVHWDeviceContext*)x->data)
@ -2383,6 +2383,9 @@ void generateVAAPIImage(CuvidDecoder * decoder, int index, const AVFrame * frame
}, },
.size = size, .size = size,
.offset = offset, .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); FeedKeyPress("XKeySym", keynam, 0, 0, letter);
break; break;
case KeyRelease: case KeyRelease:
case ButtonRelease:
break; break;
case MotionNotify: case MotionNotify:
values[0] = XCB_NONE; values[0] = XCB_NONE;