diff --git a/MSVC/ring-daemon.vcxproj b/MSVC/ring-daemon.vcxproj index f1e362ed3087e6591869ced5eaad265019c1e09b..8fcc696b704415dd01b3f355b7ddf9f7c015a449 100644 --- a/MSVC/ring-daemon.vcxproj +++ b/MSVC/ring-daemon.vcxproj @@ -415,7 +415,8 @@ <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> - <SDLCheck>false</SDLCheck> + <SDLCheck> + </SDLCheck> <AdditionalIncludeDirectories>..\..\FFmpegInterop\ffmpeg\Build\Windows10\x64\include;$(ProjectDir);$(ProjectDir)..\;$(ProjectDir)..\src;$(ProjectDir)..\src\client;$(ProjectDir)..\src\config;$(ProjectDir)..\src\dring;$(ProjectDir)..\src\hooks;$(ProjectDir)..\src\iax;$(ProjectDir)..\src\im;$(ProjectDir)..\src\media;$(ProjectDir)..\src\ringdht;$(ProjectDir)..\src\security;$(ProjectDir)..\src\sip;$(ProjectDir)..\src\upnp;$(ProjectDir)..\src\ringdht\eth;$(ProjectDir)..\contrib;$(ProjectDir)..\contrib\include;$(ProjectDir)..\contrib\include\pjlib;$(ProjectDir)..\..\libav;$(ProjectDir)..\..\libsamplerate-0.1.8\src;$(ProjectDir)..\..\libsamplerate-0.1.8\Win32;$(ProjectDir)..\contrib\pjproject\pjlib\include;$(ProjectDir)..\contrib\pjproject\pjnath\include;$(ProjectDir)..\contrib\pjproject\pjlib-util\include;$(ProjectDir)..\contrib\pjproject\pjsip\include;$(ProjectDir)..\contrib\pjproject\third_party\speex\include;$(ProjectDir)..\contrib\pjproject\third_party;$(ProjectDir)..\contrib\pjproject\pjmedia\include;$(ProjectDir)..\..\msgpack-c\include;$(ProjectDir)..\..\include;$(ProjectDir)..\..\speexdsp\include;$(ProjectDir)..\..\libsndfile-MSVC\src;$(ProjectDir)..\..\pcre;$(ProjectDir)..\..\ffmpeg;$(ProjectDir)..\contrib\boost;$(ProjectDir)..\contrib\cryptopp;$(ProjectDir)..\..\restbed\source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>BOOST_SYSTEM_NO_DEPRECATED;PJ_OS_HAS_CHECK_STACK=1;STATIC_GETOPT;_USE_MATH_DEFINES;PCRE_STATIC;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;NOMINMAX;HAVE_CONFIG_H;WIN32_LEAN_AND_MEAN;WIN32_NATIVE;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <DisableSpecificWarnings>4996;4503;4180;4244;4267;</DisableSpecificWarnings> @@ -423,6 +424,7 @@ <BasicRuntimeChecks>Default</BasicRuntimeChecks> <MultiProcessorCompilation>true</MultiProcessorCompilation> <ObjectFileName>$(IntDir)/%(RelativeDir)/</ObjectFileName> + <BufferSecurityCheck>false</BufferSecurityCheck> </ClCompile> <Link> <EnableCOMDATFolding>true</EnableCOMDATFolding> diff --git a/src/media/video/uwpvideo/video_device_impl.cpp b/src/media/video/uwpvideo/video_device_impl.cpp index ef7aeda35ea3766bacee2cfdc72577dcc6a7c201..88370c11eb2869fe1584834f229c6479bb9b09ea 100644 --- a/src/media/video/uwpvideo/video_device_impl.cpp +++ b/src/media/video/uwpvideo/video_device_impl.cpp @@ -44,12 +44,12 @@ typedef struct { enum VideoPixelFormat ring_format; } uwp_fmt; -// have all formats map to bgra -static const std::array<uwp_fmt, 4> uwp_formats { - uwp_fmt { "MJPG", VIDEO_PIXFMT_BGRA }, - uwp_fmt { "RGB24", VIDEO_PIXFMT_BGRA }, - uwp_fmt { "NV12", VIDEO_PIXFMT_BGRA }, - uwp_fmt { "YUY2", VIDEO_PIXFMT_BGRA } +// have all formats map to bgra +static const std::array<uwp_fmt, 4> uwp_formats { + uwp_fmt { "NV12", VIDEO_PIXFMT_BGRA }, + uwp_fmt { "MJPG", VIDEO_PIXFMT_BGRA }, + uwp_fmt { "RGB24", VIDEO_PIXFMT_BGRA }, + uwp_fmt { "YUY2", VIDEO_PIXFMT_BGRA }, }; class VideoDeviceImpl { diff --git a/src/ringdht/ringaccount.cpp b/src/ringdht/ringaccount.cpp index e39cc54906a0c5c9528aa3c1fafb548bd5d68588..c01db50281f5e01f968fbd80f2286d1bcf80f9bd 100644 --- a/src/ringdht/ringaccount.cpp +++ b/src/ringdht/ringaccount.cpp @@ -175,6 +175,9 @@ RingAccount::RingAccount(const std::string& accountID, bool /* presenceEnabled * dataPath_(cachePath_ + DIR_SEPARATOR_STR "values"), idPath_(fileutils::get_data_dir()+DIR_SEPARATOR_STR+getAccountID()) { +#ifdef WIN32_NATIVE + //gnutls_global_init(); +#endif } RingAccount::~RingAccount()