diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2017-10-14 18:50:54 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2017-10-14 18:50:54 +0200 |
| commit | 68cb29a12f8f2a336088f087cdbc9e0e7aa92ae5 (patch) | |
| tree | b1a8739116bd994e85cfa4ac8a275b49678ba00b /libvncclient/vncviewer.c | |
| parent | 27bc3dba7089268b0247e91957fff498a43d08dc (diff) | |
| parent | 8415ff4c3517c6697d53e1a17bba35284f480891 (diff) | |
| download | libtdevnc-68cb29a12f8f2a336088f087cdbc9e0e7aa92ae5.tar.gz libtdevnc-68cb29a12f8f2a336088f087cdbc9e0e7aa92ae5.zip | |
Merge tag 'LibVNCServer-0.9.11' of https://github.com/LibVNC/libvncserver
Conflicts:
CMakeLists.txt
libvncserver/main.c
Diffstat (limited to 'libvncclient/vncviewer.c')
| -rw-r--r-- | libvncclient/vncviewer.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libvncclient/vncviewer.c b/libvncclient/vncviewer.c index 22bf0e4..3f85c06 100644 --- a/libvncclient/vncviewer.c +++ b/libvncclient/vncviewer.c @@ -116,11 +116,7 @@ static rfbBool MallocFrameBuffer(rfbClient* client) { static void initAppData(AppData* data) { data->shareDesktop=TRUE; data->viewOnly=FALSE; -#ifdef LIBVNCSERVER_CONFIG_LIBVA - data->encodingsString="h264 tight zrle ultra copyrect hextile zlib corre rre raw"; -#else data->encodingsString="tight zrle ultra copyrect hextile zlib corre rre raw"; -#endif data->useBGR233=FALSE; data->nColours=0; data->forceOwnCmap=FALSE; @@ -224,6 +220,8 @@ rfbClient* rfbGetClient(int bitsPerSample,int samplesPerPixel, client->subAuthScheme = 0; client->GetCredential = NULL; client->tlsSession = NULL; + client->LockWriteToTLS = NULL; + client->UnlockWriteToTLS = NULL; client->sock = -1; client->listenSock = -1; client->listenAddress = NULL; |