Merge branch 'master' into surround

sunshine/platform/windows/input.cpp

@@ -2,11 +2,14 @@
 #include <iomanip>
 #include <sstream>
 
+// prevent clang format from "optimizing" the header include order
+// clang-format off
+#include <winsock2.h>
 #include <iphlpapi.h>
 #include <windows.h>
-#include <winsock2.h>
 #include <winuser.h>
 #include <ws2tcpip.h>
+// clang-format on
 
 #include <ViGEm/Client.h>
 

sunshine/video.cpp

@@ -315,6 +315,7 @@ static encoder_t software {
     // It also looks like gop_size isn't passed on to x265, so we have to set
     // 'keyint=-1' in the parameters ourselves.
     {
+      { "forced-idr"s, 1 },
       { "x265-params"s, "info=0:keyint=-1"s },
       { "preset"s, &config::video.sw.preset },
       { "tune"s, &config::video.sw.tune } },