Merge branch 'jojo61:master' into heifisch

This commit is contained in:
heifisch 2024-01-13 12:09:51 +01:00 committed by GitHub
commit 43c8ee34cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 2 deletions

View File

@ -64,7 +64,7 @@ extern void ToggleLUT();
/// vdr-plugin version number.
/// Makefile extracts the version number for generating the file name
/// for the distribution archive.
static const char *const VERSION = "3.14"
static const char *const VERSION = "3.15"
#ifdef GIT_REV
"-GIT" GIT_REV
#endif

11
video.c
View File

@ -2621,7 +2621,16 @@ void generateVAAPIImage(CuvidDecoder *decoder, VASurfaceID index, const AVFrame
glBindTexture(GL_TEXTURE_2D, decoder->gl_textures[index * Planes + n]);
EGLImageTargetTexture2DOES(GL_TEXTURE_2D, decoder->images[index * Planes + n]);
decoder->fds[index * Planes + n] = desc.objects[n].fd;
if (n==0) {
decoder->fds[index * Planes + n] = fd;
}
else if (fd == decoder->fds[index * Planes]) {
decoder->fds[index * Planes + n] = 0;
}
else {
decoder->fds[index * Planes + n] = fd;
}
}
glBindTexture(GL_TEXTURE_2D, 0);