diff --git a/SMP/libx265.def b/SMP/libx265.def index b2bb724117..a02df6311b 100644 --- a/SMP/libx265.def +++ b/SMP/libx265.def @@ -1,5 +1,5 @@ EXPORTS -x265_encoder_open_169 +x265_encoder_open_176 x265_param_default x265_param_default_preset x265_param_parse @@ -20,7 +20,7 @@ x265_encoder_get_stats x265_encoder_log x265_encoder_close x265_cleanup -x265_api_get_169 +x265_api_get_176 x265_api_query x265_encoder_intra_refresh x265_encoder_ctu_info diff --git a/SMP/libx265.vcxproj b/SMP/libx265.vcxproj index 4dedd070a3..05f13667e0 100644 --- a/SMP/libx265.vcxproj +++ b/SMP/libx265.vcxproj @@ -397,7 +397,7 @@ Level3 Disabled true - X265_VERSION=3.0;WIN32;_WINDOWS;X265_ARCH_X86=1;HAVE_INT_TYPES_H=1;ENABLE_HDR10_PLUS=1;LINKED_10BIT=1;LINKED_12BIT;X265_NS=x265;EXPORT_C_API=1;_WIN32_WINNT=0x0502;ENABLE_ASSEMBLY=1;HIGH_BIT_DEPTH=0;X265_DEPTH=8;_DEBUG;%(PreprocessorDefinitions) + X265_VERSION=3.1;WIN32;_WINDOWS;X265_ARCH_X86=1;HAVE_INT_TYPES_H=1;ENABLE_HDR10_PLUS=1;LINKED_10BIT=1;LINKED_12BIT;X265_NS=x265;EXPORT_C_API=1;_WIN32_WINNT=0x0502;ENABLE_ASSEMBLY=1;HIGH_BIT_DEPTH=0;X265_DEPTH=8;_DEBUG;%(PreprocessorDefinitions) .\;..\source;..\source\Lib;..\source\common;..\source\encoder;%(AdditionalIncludeDirectories) true 4391;4996;4838;4577;4390;4530;%(DisableSpecificWarnings) @@ -458,7 +458,7 @@ del /f /q $(OutDir)\licenses\x265.txt Level3 Disabled true - X265_VERSION=3.0;WIN32;_WINDOWS;X265_ARCH_X86=1;HAVE_INT_TYPES_H=1;ENABLE_HDR10_PLUS=1;LINKED_10BIT=1;LINKED_12BIT;X265_NS=x265;EXPORT_C_API=1;ENABLE_ASSEMBLY=1;_WIN32_WINNT=0x0600;HIGH_BIT_DEPTH=0;X265_DEPTH=8;X86_64=1;_DEBUG;%(PreprocessorDefinitions) + X265_VERSION=3.1;WIN32;_WINDOWS;X265_ARCH_X86=1;HAVE_INT_TYPES_H=1;ENABLE_HDR10_PLUS=1;LINKED_10BIT=1;LINKED_12BIT;X265_NS=x265;EXPORT_C_API=1;ENABLE_ASSEMBLY=1;_WIN32_WINNT=0x0600;HIGH_BIT_DEPTH=0;X265_DEPTH=8;X86_64=1;_DEBUG;%(PreprocessorDefinitions) .\;..\source;..\source\Lib;..\source\common;..\source\encoder;%(AdditionalIncludeDirectories) true 4391;4996;4838;4577;4390;4530;%(DisableSpecificWarnings) @@ -516,7 +516,7 @@ del /f /q $(OutDir)\licenses\x265.txt - X265_VERSION=3.0;WIN32;_WINDOWS;X265_ARCH_X86=1;HAVE_INT_TYPES_H=1;ENABLE_HDR10_PLUS=1;LINKED_10BIT=1;LINKED_12BIT;X265_NS=x265;EXPORT_C_API=1;_WIN32_WINNT=0x0502;ENABLE_ASSEMBLY=1;HIGH_BIT_DEPTH=0;X265_DEPTH=8;_DEBUG;%(PreprocessorDefinitions) + X265_VERSION=3.1;WIN32;_WINDOWS;X265_ARCH_X86=1;HAVE_INT_TYPES_H=1;ENABLE_HDR10_PLUS=1;LINKED_10BIT=1;LINKED_12BIT;X265_NS=x265;EXPORT_C_API=1;_WIN32_WINNT=0x0502;ENABLE_ASSEMBLY=1;HIGH_BIT_DEPTH=0;X265_DEPTH=8;_DEBUG;%(PreprocessorDefinitions) .\;..\source;..\source\Lib;..\source\common;..\source\encoder;%(AdditionalIncludeDirectories) true true @@ -585,7 +585,7 @@ del /f /q $(OutDir)\licenses\x265.txt Level3 Disabled true - X265_VERSION=3.0;WIN32;_WINDOWS;X265_ARCH_X86=1;HAVE_INT_TYPES_H=1;ENABLE_HDR10_PLUS=1;LINKED_10BIT=1;LINKED_12BIT;X265_NS=x265;EXPORT_C_API=1;ENABLE_ASSEMBLY=1;_WIN32_WINNT=0x0600;HIGH_BIT_DEPTH=0;X265_DEPTH=8;X86_64=1;_DEBUG;%(PreprocessorDefinitions) + X265_VERSION=3.1;WIN32;_WINDOWS;X265_ARCH_X86=1;HAVE_INT_TYPES_H=1;ENABLE_HDR10_PLUS=1;LINKED_10BIT=1;LINKED_12BIT;X265_NS=x265;EXPORT_C_API=1;ENABLE_ASSEMBLY=1;_WIN32_WINNT=0x0600;HIGH_BIT_DEPTH=0;X265_DEPTH=8;X86_64=1;_DEBUG;%(PreprocessorDefinitions) .\;..\source;..\source\Lib;..\source\common;..\source\encoder;%(AdditionalIncludeDirectories) true 4391;4996;4838;4577;4390;4530;%(DisableSpecificWarnings) @@ -657,7 +657,7 @@ del /f /q $(OutDir)\licenses\x265.txt true true true - X265_VERSION=3.0;WIN32;_WINDOWS;X265_ARCH_X86=1;HAVE_INT_TYPES_H=1;ENABLE_HDR10_PLUS=1;LINKED_10BIT=1;LINKED_12BIT;X265_NS=x265;EXPORT_C_API=1;_WIN32_WINNT=0x0502;ENABLE_ASSEMBLY=1;HIGH_BIT_DEPTH=0;X265_DEPTH=8;NDEBUG;%(PreprocessorDefinitions) + X265_VERSION=3.1;WIN32;_WINDOWS;X265_ARCH_X86=1;HAVE_INT_TYPES_H=1;ENABLE_HDR10_PLUS=1;LINKED_10BIT=1;LINKED_12BIT;X265_NS=x265;EXPORT_C_API=1;_WIN32_WINNT=0x0502;ENABLE_ASSEMBLY=1;HIGH_BIT_DEPTH=0;X265_DEPTH=8;NDEBUG;%(PreprocessorDefinitions) .\;..\source;..\source\Lib;..\source\common;..\source\encoder;%(AdditionalIncludeDirectories) SSE3 true @@ -724,7 +724,7 @@ del /f /q $(OutDir)\licenses\x265.txt true true true - X265_VERSION=3.0;WIN32;_WINDOWS;X265_ARCH_X86=1;HAVE_INT_TYPES_H=1;ENABLE_HDR10_PLUS=1;LINKED_10BIT=1;LINKED_12BIT;X265_NS=x265;EXPORT_C_API=1;_WIN32_WINNT=0x0502;ENABLE_ASSEMBLY=1;HIGH_BIT_DEPTH=0;X265_DEPTH=8;NDEBUG;%(PreprocessorDefinitions) + X265_VERSION=3.1;WIN32;_WINDOWS;X265_ARCH_X86=1;HAVE_INT_TYPES_H=1;ENABLE_HDR10_PLUS=1;LINKED_10BIT=1;LINKED_12BIT;X265_NS=x265;EXPORT_C_API=1;_WIN32_WINNT=0x0502;ENABLE_ASSEMBLY=1;HIGH_BIT_DEPTH=0;X265_DEPTH=8;NDEBUG;%(PreprocessorDefinitions) .\;..\source;..\source\Lib;..\source\common;..\source\encoder;%(AdditionalIncludeDirectories) SSE3 true @@ -791,7 +791,7 @@ del /f /q $(OutDir)\licenses\x265.txt true true true - X265_VERSION=3.0;WIN32;_WINDOWS;X265_ARCH_X86=1;HAVE_INT_TYPES_H=1;ENABLE_HDR10_PLUS=1;LINKED_10BIT=1;LINKED_12BIT;X265_NS=x265;EXPORT_C_API=1;ENABLE_ASSEMBLY=1;_WIN32_WINNT=0x0600;HIGH_BIT_DEPTH=0;X265_DEPTH=8;X86_64=1;NDEBUG;%(PreprocessorDefinitions) + X265_VERSION=3.1;WIN32;_WINDOWS;X265_ARCH_X86=1;HAVE_INT_TYPES_H=1;ENABLE_HDR10_PLUS=1;LINKED_10BIT=1;LINKED_12BIT;X265_NS=x265;EXPORT_C_API=1;ENABLE_ASSEMBLY=1;_WIN32_WINNT=0x0600;HIGH_BIT_DEPTH=0;X265_DEPTH=8;X86_64=1;NDEBUG;%(PreprocessorDefinitions) .\;..\source;..\source\Lib;..\source\common;..\source\encoder;%(AdditionalIncludeDirectories) SSE3 true @@ -858,7 +858,7 @@ del /f /q $(OutDir)\licenses\x265.txt true true true - X265_VERSION=3.0;WIN32;_WINDOWS;X265_ARCH_X86=1;HAVE_INT_TYPES_H=1;ENABLE_HDR10_PLUS=1;LINKED_10BIT=1;LINKED_12BIT;X265_NS=x265;EXPORT_C_API=1;ENABLE_ASSEMBLY=1;_WIN32_WINNT=0x0600;HIGH_BIT_DEPTH=0;X265_DEPTH=8;X86_64=1;NDEBUG;%(PreprocessorDefinitions) + X265_VERSION=3.1;WIN32;_WINDOWS;X265_ARCH_X86=1;HAVE_INT_TYPES_H=1;ENABLE_HDR10_PLUS=1;LINKED_10BIT=1;LINKED_12BIT;X265_NS=x265;EXPORT_C_API=1;ENABLE_ASSEMBLY=1;_WIN32_WINNT=0x0600;HIGH_BIT_DEPTH=0;X265_DEPTH=8;X86_64=1;NDEBUG;%(PreprocessorDefinitions) .\;..\source;..\source\Lib;..\source\common;..\source\encoder;%(AdditionalIncludeDirectories) SSE3 true @@ -917,7 +917,7 @@ del /f /q $(OutDir)\licenses\x265.txt true - X265_VERSION=3.0;WIN32;_WINDOWS;X265_ARCH_X86=1;HAVE_INT_TYPES_H=1;ENABLE_HDR10_PLUS=1;LINKED_10BIT=1;LINKED_12BIT;X265_NS=x265;EXPORT_C_API=1;_WIN32_WINNT=0x0502;ENABLE_ASSEMBLY=1;HIGH_BIT_DEPTH=0;X265_DEPTH=8;NDEBUG;%(PreprocessorDefinitions) + X265_VERSION=3.1;WIN32;_WINDOWS;X265_ARCH_X86=1;HAVE_INT_TYPES_H=1;ENABLE_HDR10_PLUS=1;LINKED_10BIT=1;LINKED_12BIT;X265_NS=x265;EXPORT_C_API=1;_WIN32_WINNT=0x0502;ENABLE_ASSEMBLY=1;HIGH_BIT_DEPTH=0;X265_DEPTH=8;NDEBUG;%(PreprocessorDefinitions) .\;..\source;..\source\Lib;..\source\common;..\source\encoder;%(AdditionalIncludeDirectories) SSE3 true @@ -1000,7 +1000,7 @@ del /f /q $(OutDir)\licenses\x265.txt true true true - X265_VERSION=3.0;WIN32;_WINDOWS;X265_ARCH_X86=1;HAVE_INT_TYPES_H=1;ENABLE_HDR10_PLUS=1;LINKED_10BIT=1;LINKED_12BIT;X265_NS=x265;EXPORT_C_API=1;ENABLE_ASSEMBLY=1;_WIN32_WINNT=0x0600;HIGH_BIT_DEPTH=0;X265_DEPTH=8;X86_64=1;NDEBUG;%(PreprocessorDefinitions) + X265_VERSION=3.1;WIN32;_WINDOWS;X265_ARCH_X86=1;HAVE_INT_TYPES_H=1;ENABLE_HDR10_PLUS=1;LINKED_10BIT=1;LINKED_12BIT;X265_NS=x265;EXPORT_C_API=1;ENABLE_ASSEMBLY=1;_WIN32_WINNT=0x0600;HIGH_BIT_DEPTH=0;X265_DEPTH=8;X86_64=1;NDEBUG;%(PreprocessorDefinitions) .\;..\source;..\source\Lib;..\source\common;..\source\encoder;%(AdditionalIncludeDirectories) SSE3 true @@ -1066,7 +1066,7 @@ del /f /q $(OutDir)\licenses\x265.txt true - X265_VERSION=3.0;WIN32;_WINDOWS;X265_ARCH_X86=1;HAVE_INT_TYPES_H=1;ENABLE_HDR10_PLUS=1;EXPORT_C_API=0;ENABLE_ASSEMBLY=0;HIGH_BIT_DEPTH=1;X265_DEPTH=10;X265_NS=x265_10bit;_WIN32_WINNT=0x0502;NDEBUG;%(PreprocessorDefinitions) + X265_VERSION=3.1;WIN32;_WINDOWS;X265_ARCH_X86=1;HAVE_INT_TYPES_H=1;ENABLE_HDR10_PLUS=1;EXPORT_C_API=0;ENABLE_ASSEMBLY=0;HIGH_BIT_DEPTH=1;X265_DEPTH=10;X265_NS=x265_10bit;_WIN32_WINNT=0x0502;NDEBUG;%(PreprocessorDefinitions) .\;..\source;..\source\Lib;..\source\common;..\source\encoder;%(AdditionalIncludeDirectories) SSE3 true @@ -1110,7 +1110,7 @@ del "$(OutDir)"\include\x265_config.h true - X265_VERSION=3.0;WIN32;_WINDOWS;X265_ARCH_X86=1;HAVE_INT_TYPES_H=1;ENABLE_HDR10_PLUS=1;EXPORT_C_API=0;ENABLE_ASSEMBLY=0;HIGH_BIT_DEPTH=1;X265_DEPTH=10;X265_NS=x265_10bit;_WIN32_WINNT=0x0502;_DEBUG;%(PreprocessorDefinitions) + X265_VERSION=3.1;WIN32;_WINDOWS;X265_ARCH_X86=1;HAVE_INT_TYPES_H=1;ENABLE_HDR10_PLUS=1;EXPORT_C_API=0;ENABLE_ASSEMBLY=0;HIGH_BIT_DEPTH=1;X265_DEPTH=10;X265_NS=x265_10bit;_WIN32_WINNT=0x0502;_DEBUG;%(PreprocessorDefinitions) .\;..\source;..\source\Lib;..\source\common;..\source\encoder;%(AdditionalIncludeDirectories) SSE3 true @@ -1145,7 +1145,7 @@ del "$(OutDir)"\include\x265_config.h true - X265_VERSION=3.0;WIN32;_WINDOWS;X265_ARCH_X86=1;HAVE_INT_TYPES_H=1;ENABLE_HDR10_PLUS=1;EXPORT_C_API=0;MAIN12=1;ENABLE_ASSEMBLY=0;HIGH_BIT_DEPTH=1;X265_DEPTH=12;X265_NS=x265_12bit;_WIN32_WINNT=0x0502;NDEBUG;%(PreprocessorDefinitions) + X265_VERSION=3.1;WIN32;_WINDOWS;X265_ARCH_X86=1;HAVE_INT_TYPES_H=1;ENABLE_HDR10_PLUS=1;EXPORT_C_API=0;MAIN12=1;ENABLE_ASSEMBLY=0;HIGH_BIT_DEPTH=1;X265_DEPTH=12;X265_NS=x265_12bit;_WIN32_WINNT=0x0502;NDEBUG;%(PreprocessorDefinitions) .\;..\source;..\source\Lib;..\source\common;..\source\encoder;%(AdditionalIncludeDirectories) SSE3 true @@ -1189,7 +1189,7 @@ del "$(OutDir)"\include\x265_config.h true - X265_VERSION=3.0;WIN32;_WINDOWS;X265_ARCH_X86=1;HAVE_INT_TYPES_H=1;ENABLE_HDR10_PLUS=1;EXPORT_C_API=0;MAIN12=1;ENABLE_ASSEMBLY=0;HIGH_BIT_DEPTH=1;X265_DEPTH=12;X265_NS=x265_12bit;_WIN32_WINNT=0x0502;_DEBUG;%(PreprocessorDefinitions) + X265_VERSION=3.1;WIN32;_WINDOWS;X265_ARCH_X86=1;HAVE_INT_TYPES_H=1;ENABLE_HDR10_PLUS=1;EXPORT_C_API=0;MAIN12=1;ENABLE_ASSEMBLY=0;HIGH_BIT_DEPTH=1;X265_DEPTH=12;X265_NS=x265_12bit;_WIN32_WINNT=0x0502;_DEBUG;%(PreprocessorDefinitions) .\;..\source;..\source\Lib;..\source\common;..\source\encoder;%(AdditionalIncludeDirectories) SSE3 true @@ -1235,7 +1235,7 @@ del "$(OutDir)"\include\x265_config.h false Fast false - X265_VERSION=3.0;WIN32;_WINDOWS;X265_ARCH_X86=1;HAVE_INT_TYPES_H=1;ENABLE_HDR10_PLUS=1;EXPORT_C_API=0;ENABLE_ASSEMBLY=1;HIGH_BIT_DEPTH=1;X265_DEPTH=10;X265_NS=x265_10bit;_WIN32_WINNT=0x0600;X86_64=1;NDEBUG;%(PreprocessorDefinitions) + X265_VERSION=3.1;WIN32;_WINDOWS;X265_ARCH_X86=1;HAVE_INT_TYPES_H=1;ENABLE_HDR10_PLUS=1;EXPORT_C_API=0;ENABLE_ASSEMBLY=1;HIGH_BIT_DEPTH=1;X265_DEPTH=10;X265_NS=x265_10bit;_WIN32_WINNT=0x0600;X86_64=1;NDEBUG;%(PreprocessorDefinitions) .\;..\source;..\source\Lib;..\source\common;..\source\encoder;%(AdditionalIncludeDirectories) SSE3 true @@ -1269,7 +1269,7 @@ del "$(OutDir)"\include\x265_config.h Level3 true - X265_VERSION=3.0;WIN32;_WINDOWS;X265_ARCH_X86=1;HAVE_INT_TYPES_H=1;ENABLE_HDR10_PLUS=1;EXPORT_C_API=0;ENABLE_ASSEMBLY=1;HIGH_BIT_DEPTH=1;X265_DEPTH=10;X265_NS=x265_10bit;_WIN32_WINNT=0x0600;X86_64=1;_DEBUG;%(PreprocessorDefinitions) + X265_VERSION=3.1;WIN32;_WINDOWS;X265_ARCH_X86=1;HAVE_INT_TYPES_H=1;ENABLE_HDR10_PLUS=1;EXPORT_C_API=0;ENABLE_ASSEMBLY=1;HIGH_BIT_DEPTH=1;X265_DEPTH=10;X265_NS=x265_10bit;_WIN32_WINNT=0x0600;X86_64=1;_DEBUG;%(PreprocessorDefinitions) .\;..\source;..\source\Lib;..\source\common;..\source\encoder;%(AdditionalIncludeDirectories) SSE3 true @@ -1314,7 +1314,7 @@ del "$(OutDir)"\include\x265_config.h false Fast false - X265_VERSION=3.0;WIN32;_WINDOWS;X265_ARCH_X86=1;HAVE_INT_TYPES_H=1;ENABLE_HDR10_PLUS=1;EXPORT_C_API=0;MAIN12=1;ENABLE_ASSEMBLY=1;HIGH_BIT_DEPTH=1;X265_DEPTH=12;X265_NS=x265_12bit;_WIN32_WINNT=0x0600;X86_64=1;NDEBUG;%(PreprocessorDefinitions) + X265_VERSION=3.1;WIN32;_WINDOWS;X265_ARCH_X86=1;HAVE_INT_TYPES_H=1;ENABLE_HDR10_PLUS=1;EXPORT_C_API=0;MAIN12=1;ENABLE_ASSEMBLY=1;HIGH_BIT_DEPTH=1;X265_DEPTH=12;X265_NS=x265_12bit;_WIN32_WINNT=0x0600;X86_64=1;NDEBUG;%(PreprocessorDefinitions) .\;..\source;..\source\Lib;..\source\common;..\source\encoder;%(AdditionalIncludeDirectories) SSE3 true @@ -1348,7 +1348,7 @@ del "$(OutDir)"\include\x265_config.h Level3 true - X265_VERSION=3.0;WIN32;_WINDOWS;X265_ARCH_X86=1;HAVE_INT_TYPES_H=1;ENABLE_HDR10_PLUS=1;EXPORT_C_API=0;MAIN12=1;ENABLE_ASSEMBLY=1;HIGH_BIT_DEPTH=1;X265_DEPTH=12;X265_NS=x265_12bit;_WIN32_WINNT=0x0600;X86_64=1;_DEBUG;%(PreprocessorDefinitions) + X265_VERSION=3.1;WIN32;_WINDOWS;X265_ARCH_X86=1;HAVE_INT_TYPES_H=1;ENABLE_HDR10_PLUS=1;EXPORT_C_API=0;MAIN12=1;ENABLE_ASSEMBLY=1;HIGH_BIT_DEPTH=1;X265_DEPTH=12;X265_NS=x265_12bit;_WIN32_WINNT=0x0600;X86_64=1;_DEBUG;%(PreprocessorDefinitions) .\;..\source;..\source\Lib;..\source\common;..\source\encoder;%(AdditionalIncludeDirectories) SSE3 true diff --git a/SMP/x265.rc b/SMP/x265.rc index 788f2dc1fd..0fe74f7865 100644 --- a/SMP/x265.rc +++ b/SMP/x265.rc @@ -1,8 +1,8 @@ #include VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,0,0,0 - PRODUCTVERSION 3,0,0,0 + FILEVERSION 3,1,0,0 + PRODUCTVERSION 3,1,0,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEOS VOS_NT_WINDOWS32 #ifdef OPENOBEX_EXPORTS @@ -17,12 +17,12 @@ VS_VERSION_INFO VERSIONINFO BLOCK "04090000" BEGIN VALUE "FileDescription", "HEVC video encoder" - VALUE "FileVersion", "3.0" + VALUE "FileVersion", "3.1" VALUE "InternalName", "x265" VALUE "LegalCopyright", "Multicoreware: GPLv2 or commercial" VALUE "OriginalFilename", "libx265.dll" VALUE "ProductName", "x265" - VALUE "ProductVersion", "3.0" + VALUE "ProductVersion", "3.1" END END BLOCK "VarFileInfo" diff --git a/SMP/x265_config.h b/SMP/x265_config.h index 5511317e5b..94b0f63729 100644 --- a/SMP/x265_config.h +++ b/SMP/x265_config.h @@ -29,6 +29,6 @@ /* Incremented each time public API is changed, X265_BUILD is used as * the shared library SONAME on platforms which support it. It also * prevents linking against a different version of the static lib */ -#define X265_BUILD 169 +#define X265_BUILD 176 #endif