mirror of
https://github.com/jojo61/vdr-plugin-softhdcuvid.git
synced 2025-03-01 10:39:28 +00:00
Merge branch 'jojo61:master' into heifisch
This commit is contained in:
commit
43c8ee34cb
@ -64,7 +64,7 @@ extern void ToggleLUT();
|
|||||||
/// 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.14"
|
static const char *const VERSION = "3.15"
|
||||||
#ifdef GIT_REV
|
#ifdef GIT_REV
|
||||||
"-GIT" GIT_REV
|
"-GIT" GIT_REV
|
||||||
#endif
|
#endif
|
||||||
|
11
video.c
11
video.c
@ -2621,7 +2621,16 @@ void generateVAAPIImage(CuvidDecoder *decoder, VASurfaceID index, const AVFrame
|
|||||||
|
|
||||||
glBindTexture(GL_TEXTURE_2D, decoder->gl_textures[index * Planes + n]);
|
glBindTexture(GL_TEXTURE_2D, decoder->gl_textures[index * Planes + n]);
|
||||||
EGLImageTargetTexture2DOES(GL_TEXTURE_2D, decoder->images[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);
|
glBindTexture(GL_TEXTURE_2D, 0);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user