From 134ffe924f7bd587ded430aa2b7af18eb2f99e89 Mon Sep 17 00:00:00 2001 From: Aidan Delaney Date: Sat, 8 May 2021 19:14:14 +0100 Subject: [PATCH] obs-qsv11: Remove Intel NDA from qsv11 plugin Intel committed an NDA disclaimer on each source file. The stated intention was that the NDA "added to OBS doesn't apply to open source code once it's been accepted by the community. You can remove it for your modifications". This quote is from an email chain involving Intel's legal team and developers. The NDA in the source files mistakenly triggers source code scanners that look for license violations. I have removed the comments that contain the NDA. --- plugins/obs-qsv11/bits/linux_defs.h | 10 ---------- plugins/obs-qsv11/bits/windows_defs.h | 10 ---------- plugins/obs-qsv11/common_directx11.cpp | 10 ---------- plugins/obs-qsv11/common_directx11.h | 10 ---------- plugins/obs-qsv11/common_directx9.h | 10 ---------- plugins/obs-qsv11/common_utils.cpp | 10 ---------- plugins/obs-qsv11/common_utils.h | 10 ---------- plugins/obs-qsv11/common_utils_windows.cpp | 10 ---------- plugins/obs-qsv11/device_directx9.cpp | 10 ---------- plugins/obs-qsv11/device_directx9.h | 10 ---------- 10 files changed, 100 deletions(-) diff --git a/plugins/obs-qsv11/bits/linux_defs.h b/plugins/obs-qsv11/bits/linux_defs.h index 7a46dbbfa..87c728840 100644 --- a/plugins/obs-qsv11/bits/linux_defs.h +++ b/plugins/obs-qsv11/bits/linux_defs.h @@ -1,13 +1,3 @@ -/***************************************************************************** - -INTEL CORPORATION PROPRIETARY INFORMATION -This software is supplied under the terms of a license agreement or -nondisclosure agreement with Intel Corporation and may not be copied -or disclosed except in accordance with the terms of that agreement. -Copyright(c) 2005-2014 Intel Corporation. All Rights Reserved. - -*****************************************************************************/ - #include #include #include diff --git a/plugins/obs-qsv11/bits/windows_defs.h b/plugins/obs-qsv11/bits/windows_defs.h index d81cae5db..44147375b 100644 --- a/plugins/obs-qsv11/bits/windows_defs.h +++ b/plugins/obs-qsv11/bits/windows_defs.h @@ -1,13 +1,3 @@ -/***************************************************************************** - -INTEL CORPORATION PROPRIETARY INFORMATION -This software is supplied under the terms of a license agreement or -nondisclosure agreement with Intel Corporation and may not be copied -or disclosed except in accordance with the terms of that agreement. -Copyright(c) 2005-2014 Intel Corporation. All Rights Reserved. - -*****************************************************************************/ - #include #define MSDK_FOPEN(FH, FN, M) { fopen_s(&FH, FN, M); } diff --git a/plugins/obs-qsv11/common_directx11.cpp b/plugins/obs-qsv11/common_directx11.cpp index 3df68716a..086a238ac 100644 --- a/plugins/obs-qsv11/common_directx11.cpp +++ b/plugins/obs-qsv11/common_directx11.cpp @@ -1,13 +1,3 @@ -/***************************************************************************** - -INTEL CORPORATION PROPRIETARY INFORMATION -This software is supplied under the terms of a license agreement or -nondisclosure agreement with Intel Corporation and may not be copied -or disclosed except in accordance with the terms of that agreement. -Copyright(c) 2005-2014 Intel Corporation. All Rights Reserved. - -*****************************************************************************/ - #include "common_directx11.h" #include diff --git a/plugins/obs-qsv11/common_directx11.h b/plugins/obs-qsv11/common_directx11.h index 58928f2b3..b01e6b212 100644 --- a/plugins/obs-qsv11/common_directx11.h +++ b/plugins/obs-qsv11/common_directx11.h @@ -1,13 +1,3 @@ -/***************************************************************************** - -INTEL CORPORATION PROPRIETARY INFORMATION -This software is supplied under the terms of a license agreement or -nondisclosure agreement with Intel Corporation and may not be copied -or disclosed except in accordance with the terms of that agreement. -Copyright(c) 2005-2014 Intel Corporation. All Rights Reserved. - -*****************************************************************************/ - #pragma once #include "common_utils.h" diff --git a/plugins/obs-qsv11/common_directx9.h b/plugins/obs-qsv11/common_directx9.h index b5decbde5..2b9a4ff9c 100644 --- a/plugins/obs-qsv11/common_directx9.h +++ b/plugins/obs-qsv11/common_directx9.h @@ -1,13 +1,3 @@ -/********************************************************************************* - -INTEL CORPORATION PROPRIETARY INFORMATION -This software is supplied under the terms of a license agreement or nondisclosure -agreement with Intel Corporation and may not be copied or disclosed except in -accordance with the terms of that agreement -Copyright(c) 2011-2014 Intel Corporation. All Rights Reserved. - -**********************************************************************************/ - #pragma once #include "common_utils.h" diff --git a/plugins/obs-qsv11/common_utils.cpp b/plugins/obs-qsv11/common_utils.cpp index bd8cb5482..03e6f51db 100644 --- a/plugins/obs-qsv11/common_utils.cpp +++ b/plugins/obs-qsv11/common_utils.cpp @@ -1,13 +1,3 @@ -/***************************************************************************** - -INTEL CORPORATION PROPRIETARY INFORMATION -This software is supplied under the terms of a license agreement or -nondisclosure agreement with Intel Corporation and may not be copied -or disclosed except in accordance with the terms of that agreement. -Copyright(c) 2005-2014 Intel Corporation. All Rights Reserved. - -*****************************************************************************/ - #include "common_utils.h" // ================================================================= diff --git a/plugins/obs-qsv11/common_utils.h b/plugins/obs-qsv11/common_utils.h index 25568ebe7..bfbac1fbe 100644 --- a/plugins/obs-qsv11/common_utils.h +++ b/plugins/obs-qsv11/common_utils.h @@ -1,13 +1,3 @@ -/***************************************************************************** - -INTEL CORPORATION PROPRIETARY INFORMATION -This software is supplied under the terms of a license agreement or -nondisclosure agreement with Intel Corporation and may not be copied -or disclosed except in accordance with the terms of that agreement. -Copyright(c) 2005-2014 Intel Corporation. All Rights Reserved. - -*****************************************************************************/ - #pragma once #include diff --git a/plugins/obs-qsv11/common_utils_windows.cpp b/plugins/obs-qsv11/common_utils_windows.cpp index f5a9947cc..2a383877d 100644 --- a/plugins/obs-qsv11/common_utils_windows.cpp +++ b/plugins/obs-qsv11/common_utils_windows.cpp @@ -1,13 +1,3 @@ -/***************************************************************************** - -INTEL CORPORATION PROPRIETARY INFORMATION -This software is supplied under the terms of a license agreement or -nondisclosure agreement with Intel Corporation and may not be copied -or disclosed except in accordance with the terms of that agreement. -Copyright(c) 2005-2014 Intel Corporation. All Rights Reserved. - -*****************************************************************************/ - #include "common_utils.h" // ATTENTION: If D3D surfaces are used, DX9_D3D or DX11_D3D must be set in project settings or hardcoded here diff --git a/plugins/obs-qsv11/device_directx9.cpp b/plugins/obs-qsv11/device_directx9.cpp index 1ab7076f7..2c3fdf74f 100644 --- a/plugins/obs-qsv11/device_directx9.cpp +++ b/plugins/obs-qsv11/device_directx9.cpp @@ -1,13 +1,3 @@ -/********************************************************************************* - -INTEL CORPORATION PROPRIETARY INFORMATION -This software is supplied under the terms of a license agreement or nondisclosure -agreement with Intel Corporation and may not be copied or disclosed except in -accordance with the terms of that agreement -Copyright(c) 2011-2015 Intel Corporation. All Rights Reserved. - -**********************************************************************************/ - // #include "mfx_samples_config.h" #if defined(WIN32) || defined(WIN64) diff --git a/plugins/obs-qsv11/device_directx9.h b/plugins/obs-qsv11/device_directx9.h index ef0d4814c..16b482188 100644 --- a/plugins/obs-qsv11/device_directx9.h +++ b/plugins/obs-qsv11/device_directx9.h @@ -1,13 +1,3 @@ -/********************************************************************************* - -INTEL CORPORATION PROPRIETARY INFORMATION -This software is supplied under the terms of a license agreement or nondisclosure -agreement with Intel Corporation and may not be copied or disclosed except in -accordance with the terms of that agreement -Copyright(c) 2011-2014 Intel Corporation. All Rights Reserved. - -**********************************************************************************/ - #pragma once #if defined(_WIN32) || defined(_WIN64)