Fix merge conflicts with release branch after rebase on ntv2_17_5

There were changes made to the release branch that never made their way back to main/ntv2_17_5

The release branch will be locked down in future to prevent this from happening again.

Author: paulh-aja

CMakeLists.txt

@@ -25,6 +25,10 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
 	if (DEFINED AJA_MSVC_RUNTIME_LIBRARY)
 		set(CMAKE_MSVC_RUNTIME_LIBRARY "${AJA_MSVC_RUNTIME_LIBRARY}" PARENT_SCOPE)
 	endif()
+
+    if(NOT CMAKE_MSVC_RUNTIME_LIBRARY)
+        set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded") 
+    endif()
 endif()
 
 option(AJANTV2_BUILD_OPENSOURCE    "Build libajantv2 as open-source (MIT license)?"   ON)

README.md

@@ -142,7 +142,6 @@ Please follow the instructions below to build `libajantv2` on the supported plat
      $ cmake -S . -B bld-x86 -G Xcode -DCMAKE_OSX_ARCHITECTURES=x86_64
      $ cmake -S . -B bld-fat -G Xcode -DCMAKE_OSX_ARCHITECTURES=arm64;x86_64
      ```
-
  1. Build the `libajantv2` static library from the **Terminal**, via the generated XCode Project:
      ```
      $ cmake --build build

ajaanc/src/ancillarylist.cpp

@@ -1762,7 +1762,7 @@ bool AJAAncillaryList::StripNativeInserterGUMPPackets (const NTV2Buffer & inSrc,
 		::memcpy(tgtPtr, srcPtr, uncopied);	//	Copy last uncopied bytes
 	//	cout << DEC(numStripped) << " pkts removed, " << DEC(bytesRemoved) << " bytes removed" << endl;
 	return true;
-}	//	StripNativeInserterPackets
+}	//	StripNativeInserterGUMPPackets
 
 
 //////////////////////////////////////////////////////////////////////////////////////////////////

ajantv2/src/ntv2nubaccess.cpp

@@ -1800,6 +1800,11 @@ bool NTV2PluginLoader::validate (void)
 				<< "Issuer serial: " << fingerprint << "|AJA serial: " << ajaFingerprint);
 		return fail();	//	fail
 	}
+	if (fingerprint != ajaFingerprint)
+	{	P_FAIL(pluginPath() << " not authorized/signed by AJA: Issuer serial mismatch: " << fingerprint
+				<< " vs " << ajaFingerprint);
+		return false;	//	fail
+	}
 
 	//	Green light
 	mValidated = true;