Fix compilation errors with strict MSVC settings

obsproject · Mar 1, 2023 · 58b9ade · 58b9ade
1 parent 3b09f2a
commit 58b9ade
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/include/api-d3d11.hpp b/include/api-d3d11.hpp
@@ -18,7 +18,7 @@
  */
 
 #pragma once
-#include <atlutil.h>
+#include <atlcomcli.h>
 #include <d3d11.h>
 #include <dxgi.h>
 #include <map>

diff --git a/include/api-d3d9.hpp b/include/api-d3d9.hpp
@@ -18,7 +18,7 @@
  */
 
 #pragma once
-#include <atlutil.h>
+#include <atlcomcli.h>
 #include <d3d9.h>
 #include "api-base.hpp"
 

diff --git a/include/plugin.hpp b/include/plugin.hpp
@@ -37,11 +37,11 @@ extern "C" {
 
 #ifndef LITE_OBS
 #define PLOG(level, ...) blog(level, "[AMF] " __VA_ARGS__)
-#define PLOG_ERROR(format, ...) PLOG(LOG_ERROR, format, __VA_ARGS__)
+#define PLOG_ERROR(format, ...) PLOG(LOG_ERROR, format, ##__VA_ARGS__)
 #define PLOG_VAR(var) var
 #else
 #define PLOG(...) (void)0
-#define PLOG_ERROR(format, ...) printf("[AMF] " format "\n", __VA_ARGS__)
+#define PLOG_ERROR(format, ...) printf("[AMF] " format "\n", ##__VA_ARGS__)
 #define PLOG_VAR(var)
 #endif
 #define PLOG_WARNING(...) PLOG(LOG_WARNING, __VA_ARGS__)

diff --git a/source/utility.cpp b/source/utility.cpp
@@ -801,7 +801,7 @@ Plugin::AMD::ProfileLevel Utility::H265ProfileLevel(std::pair<uint32_t, uint32_t
 											  level(ProfileLevel::L52, levelRestriction(8912896, 1069547520)),
 											  level(ProfileLevel::L60, levelRestriction(35651584, 1069547520)),
 											  level(ProfileLevel::L61, levelRestriction(35651584, 2139095040)),
-											  level(ProfileLevel::L62, levelRestriction(35651584, 4278190080)),
+											  level(ProfileLevel::L62, levelRestriction(35651584, 4278190080u)),
 											  level((ProfileLevel)-1, levelRestriction(0, 0))};
 
 	uint32_t samples     = resolution.first * resolution.second;