jyapayne/Sunshine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge branch 'nvenc' of github.com:loki-47-6F-64/sunshine into nvenc

Browse source
This commit is contained in:
loki 2020-04-17 19:19:12 +02:00
commit d81ba12aa8
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pre-compiled

@ -1 +1 @@
Subproject commit 51f776dbd4b2ead239a966406447d12f7e942636
Subproject commit 8ec14fd4a40d85443084b283ab24415d729984cb

5
sunshine/video.cpp
View file

@ -1261,7 +1261,10 @@ util::Either<buffer_t, int> nv_d3d_make_hwdevice_ctx(platf::hwdevice_t *hwdevice
auto ctx = (AVD3D11VADeviceContext*)((AVHWDeviceContext*)ctx_buf->data)->hwctx;
std::fill_n((std::uint8_t*)ctx, sizeof(AVD3D11VADeviceContext), 0);
std::swap(ctx->device, *(ID3D11Device**)&hwdevice_ctx->data);
auto device = (ID3D11Device*)hwdevice_ctx->data;
device->AddRef();
ctx->device = device;
auto err = av_hwdevice_ctx_init(ctx_buf.get());
if(err) {