Merging //UE5/Release-Engine-Staging to Main (//UE5/Main) @ 14075166

#rb
#rnx

[CL 14075271 by Marc Audy in ue5-main branch]
This commit is contained in:
Marc Audy
2020-08-11 01:36:57 -04:00
parent fa1f2339b5
commit a7c9001a94
5532 changed files with 991019 additions and 66660 deletions
@@ -5,7 +5,7 @@
#include "AVEncoder.h"
#include "AVEncoderCommon.h"
#if PLATFORM_WINDOWS || PLATFORM_XBOXONE
#if AVENCODER_SUPPORTED_MICROSOFT_PLATFORM
namespace AVEncoder
{
@@ -23,5 +23,5 @@ private:
}
#endif
#endif //AVENCODER_SUPPORTED_MICROSOFT_PLATFORM