Skip to content
This repository was archived by the owner on Jan 26, 2026. It is now read-only.

Commit 1a630bf

Browse files
committed
project: Update for 2.0 merge.
1 parent 8b9b3b3 commit 1a630bf

4 files changed

Lines changed: 27 additions & 26 deletions

File tree

SMP/libx265.def

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
EXPORTS
2-
x265_encoder_open_79
2+
x265_encoder_open_87
33
x265_param_default
44
x265_param_default_preset
55
x265_param_parse
@@ -20,6 +20,6 @@ x265_encoder_get_stats
2020
x265_encoder_log
2121
x265_encoder_close
2222
x265_cleanup
23-
x265_api_get_79
23+
x265_api_get_87
2424
x265_api_query
2525
x265_encoder_intra_refresh

SMP/libx265.vcxproj

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@
381381
<WarningLevel>Level3</WarningLevel>
382382
<Optimization>Disabled</Optimization>
383383
<MultiProcessorCompilation>true</MultiProcessorCompilation>
384-
<PreprocessorDefinitions>X265_VERSION=1.9;WIN32;_WINDOWS;X265_ARCH_X86=1;HAVE_INT_TYPES_H=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)</PreprocessorDefinitions>
384+
<PreprocessorDefinitions>X265_VERSION=2.0;WIN32;_WINDOWS;X265_ARCH_X86=1;HAVE_INT_TYPES_H=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)</PreprocessorDefinitions>
385385
<AdditionalIncludeDirectories>.\;..\source;..\source\Lib;..\source\common;..\source\encoder;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
386386
<C99Support>true</C99Support>
387387
<ExceptionHandling>false</ExceptionHandling>
@@ -446,7 +446,7 @@ del /f /q $(OutDir)\licenses\x265.txt
446446
<WarningLevel>Level3</WarningLevel>
447447
<Optimization>Disabled</Optimization>
448448
<MultiProcessorCompilation>true</MultiProcessorCompilation>
449-
<PreprocessorDefinitions>X265_VERSION=1.9;WIN32;_WINDOWS;X265_ARCH_X86=1;HAVE_INT_TYPES_H=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)</PreprocessorDefinitions>
449+
<PreprocessorDefinitions>X265_VERSION=2.0;WIN32;_WINDOWS;X265_ARCH_X86=1;HAVE_INT_TYPES_H=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)</PreprocessorDefinitions>
450450
<AdditionalIncludeDirectories>.\;..\source;..\source\Lib;..\source\common;..\source\encoder;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
451451
<C99Support>true</C99Support>
452452
<ExceptionHandling>false</ExceptionHandling>
@@ -506,7 +506,7 @@ del /f /q $(OutDir)\licenses\x265.txt
506506
</ItemDefinitionGroup>
507507
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'">
508508
<ClCompile>
509-
<PreprocessorDefinitions>X265_VERSION=1.9;WIN32;_WINDOWS;X265_ARCH_X86=1;HAVE_INT_TYPES_H=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)</PreprocessorDefinitions>
509+
<PreprocessorDefinitions>X265_VERSION=2.0;WIN32;_WINDOWS;X265_ARCH_X86=1;HAVE_INT_TYPES_H=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)</PreprocessorDefinitions>
510510
<AdditionalIncludeDirectories>.\;..\source;..\source\Lib;..\source\common;..\source\encoder;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
511511
<C99Support>true</C99Support>
512512
<MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -573,7 +573,7 @@ del /f /q $(OutDir)\licenses\x265.txt
573573
<WarningLevel>Level3</WarningLevel>
574574
<Optimization>Disabled</Optimization>
575575
<MultiProcessorCompilation>true</MultiProcessorCompilation>
576-
<PreprocessorDefinitions>X265_VERSION=1.9;WIN32;_WINDOWS;X265_ARCH_X86=1;HAVE_INT_TYPES_H=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)</PreprocessorDefinitions>
576+
<PreprocessorDefinitions>X265_VERSION=2.0;WIN32;_WINDOWS;X265_ARCH_X86=1;HAVE_INT_TYPES_H=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)</PreprocessorDefinitions>
577577
<AdditionalIncludeDirectories>.\;..\source;..\source\Lib;..\source\common;..\source\encoder;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
578578
<C99Support>true</C99Support>
579579
<ExceptionHandling>false</ExceptionHandling>
@@ -646,7 +646,7 @@ del /f /q $(OutDir)\licenses\x265.txt
646646
<BufferSecurityCheck>false</BufferSecurityCheck>
647647
<FloatingPointModel>Fast</FloatingPointModel>
648648
<FloatingPointExceptions>false</FloatingPointExceptions>
649-
<PreprocessorDefinitions>X265_VERSION=1.9;WIN32;_WINDOWS;X265_ARCH_X86=1;HAVE_INT_TYPES_H=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)</PreprocessorDefinitions>
649+
<PreprocessorDefinitions>X265_VERSION=2.0;WIN32;_WINDOWS;X265_ARCH_X86=1;HAVE_INT_TYPES_H=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)</PreprocessorDefinitions>
650650
<AdditionalIncludeDirectories>.\;..\source;..\source\Lib;..\source\common;..\source\encoder;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
651651
<UseProcessorExtensions>SSE3</UseProcessorExtensions>
652652
<C99Support>true</C99Support>
@@ -722,7 +722,7 @@ del /f /q $(OutDir)\licenses\x265.txt
722722
<BufferSecurityCheck>false</BufferSecurityCheck>
723723
<FloatingPointModel>Fast</FloatingPointModel>
724724
<FloatingPointExceptions>false</FloatingPointExceptions>
725-
<PreprocessorDefinitions>X265_VERSION=1.9;WIN32;_WINDOWS;X265_ARCH_X86=1;HAVE_INT_TYPES_H=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)</PreprocessorDefinitions>
725+
<PreprocessorDefinitions>X265_VERSION=2.0;WIN32;_WINDOWS;X265_ARCH_X86=1;HAVE_INT_TYPES_H=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)</PreprocessorDefinitions>
726726
<AdditionalIncludeDirectories>.\;..\source;..\source\Lib;..\source\common;..\source\encoder;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
727727
<UseProcessorExtensions>SSE3</UseProcessorExtensions>
728728
<C99Support>true</C99Support>
@@ -798,7 +798,7 @@ del /f /q $(OutDir)\licenses\x265.txt
798798
<BufferSecurityCheck>false</BufferSecurityCheck>
799799
<FloatingPointModel>Fast</FloatingPointModel>
800800
<FloatingPointExceptions>false</FloatingPointExceptions>
801-
<PreprocessorDefinitions>X265_VERSION=1.9;WIN32;_WINDOWS;X265_ARCH_X86=1;HAVE_INT_TYPES_H=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)</PreprocessorDefinitions>
801+
<PreprocessorDefinitions>X265_VERSION=2.0;WIN32;_WINDOWS;X265_ARCH_X86=1;HAVE_INT_TYPES_H=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)</PreprocessorDefinitions>
802802
<AdditionalIncludeDirectories>.\;..\source;..\source\Lib;..\source\common;..\source\encoder;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
803803
<UseProcessorExtensions>SSE3</UseProcessorExtensions>
804804
<C99Support>true</C99Support>
@@ -874,7 +874,7 @@ del /f /q $(OutDir)\licenses\x265.txt
874874
<BufferSecurityCheck>false</BufferSecurityCheck>
875875
<FloatingPointModel>Fast</FloatingPointModel>
876876
<FloatingPointExceptions>false</FloatingPointExceptions>
877-
<PreprocessorDefinitions>X265_VERSION=1.9;WIN32;_WINDOWS;X265_ARCH_X86=1;HAVE_INT_TYPES_H=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)</PreprocessorDefinitions>
877+
<PreprocessorDefinitions>X265_VERSION=2.0;WIN32;_WINDOWS;X265_ARCH_X86=1;HAVE_INT_TYPES_H=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)</PreprocessorDefinitions>
878878
<AdditionalIncludeDirectories>.\;..\source;..\source\Lib;..\source\common;..\source\encoder;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
879879
<UseProcessorExtensions>SSE3</UseProcessorExtensions>
880880
<C99Support>true</C99Support>
@@ -939,7 +939,7 @@ del /f /q $(OutDir)\licenses\x265.txt
939939
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'">
940940
<ClCompile>
941941
<MultiProcessorCompilation>true</MultiProcessorCompilation>
942-
<PreprocessorDefinitions>X265_VERSION=1.9;WIN32;_WINDOWS;X265_ARCH_X86=1;HAVE_INT_TYPES_H=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)</PreprocessorDefinitions>
942+
<PreprocessorDefinitions>X265_VERSION=2.0;WIN32;_WINDOWS;X265_ARCH_X86=1;HAVE_INT_TYPES_H=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)</PreprocessorDefinitions>
943943
<AdditionalIncludeDirectories>.\;..\source;..\source\Lib;..\source\common;..\source\encoder;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
944944
<UseProcessorExtensions>SSE3</UseProcessorExtensions>
945945
<C99Support>true</C99Support>
@@ -1028,7 +1028,7 @@ del /f /q $(OutDir)\licenses\x265.txt
10281028
<BufferSecurityCheck>false</BufferSecurityCheck>
10291029
<FloatingPointModel>Fast</FloatingPointModel>
10301030
<FloatingPointExceptions>false</FloatingPointExceptions>
1031-
<PreprocessorDefinitions>X265_VERSION=1.9;WIN32;_WINDOWS;X265_ARCH_X86=1;HAVE_INT_TYPES_H=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)</PreprocessorDefinitions>
1031+
<PreprocessorDefinitions>X265_VERSION=2.0;WIN32;_WINDOWS;X265_ARCH_X86=1;HAVE_INT_TYPES_H=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)</PreprocessorDefinitions>
10321032
<AdditionalIncludeDirectories>.\;..\source;..\source\Lib;..\source\common;..\source\encoder;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
10331033
<UseProcessorExtensions>SSE3</UseProcessorExtensions>
10341034
<C99Support>true</C99Support>
@@ -1094,7 +1094,7 @@ del /f /q $(OutDir)\licenses\x265.txt
10941094
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_10b|Win32'">
10951095
<ClCompile>
10961096
<MultiProcessorCompilation>true</MultiProcessorCompilation>
1097-
<PreprocessorDefinitions>X265_VERSION=1.9;WIN32;_WINDOWS;X265_ARCH_X86=1;HAVE_INT_TYPES_H=1;EXPORT_C_API=0;ENABLE_ASSEMBLY=0;HIGH_BIT_DEPTH=1;X265_DEPTH=10;X265_NS=x265_10bit;_WIN32_WINNT=0x0502;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
1097+
<PreprocessorDefinitions>X265_VERSION=2.0;WIN32;_WINDOWS;X265_ARCH_X86=1;HAVE_INT_TYPES_H=1;EXPORT_C_API=0;ENABLE_ASSEMBLY=0;HIGH_BIT_DEPTH=1;X265_DEPTH=10;X265_NS=x265_10bit;_WIN32_WINNT=0x0502;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
10981098
<AdditionalIncludeDirectories>.\;..\source;..\source\Lib;..\source\common;..\source\encoder;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
10991099
<UseProcessorExtensions>SSE3</UseProcessorExtensions>
11001100
<C99Support>true</C99Support>
@@ -1138,7 +1138,7 @@ del $(OutDir)\include\x265_config.h
11381138
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_10b|Win32'">
11391139
<ClCompile>
11401140
<MultiProcessorCompilation>true</MultiProcessorCompilation>
1141-
<PreprocessorDefinitions>X265_VERSION=1.9;WIN32;_WINDOWS;X265_ARCH_X86=1;HAVE_INT_TYPES_H=1;EXPORT_C_API=0;ENABLE_ASSEMBLY=0;HIGH_BIT_DEPTH=1;X265_DEPTH=10;X265_NS=x265_10bit;_WIN32_WINNT=0x0502;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
1141+
<PreprocessorDefinitions>X265_VERSION=2.0;WIN32;_WINDOWS;X265_ARCH_X86=1;HAVE_INT_TYPES_H=1;EXPORT_C_API=0;ENABLE_ASSEMBLY=0;HIGH_BIT_DEPTH=1;X265_DEPTH=10;X265_NS=x265_10bit;_WIN32_WINNT=0x0502;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
11421142
<AdditionalIncludeDirectories>.\;..\source;..\source\Lib;..\source\common;..\source\encoder;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
11431143
<UseProcessorExtensions>SSE3</UseProcessorExtensions>
11441144
<C99Support>true</C99Support>
@@ -1172,7 +1172,7 @@ del $(OutDir)\include\x265_config.h
11721172
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_12b|Win32'">
11731173
<ClCompile>
11741174
<MultiProcessorCompilation>true</MultiProcessorCompilation>
1175-
<PreprocessorDefinitions>X265_VERSION=1.9;WIN32;_WINDOWS;X265_ARCH_X86=1;HAVE_INT_TYPES_H=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)</PreprocessorDefinitions>
1175+
<PreprocessorDefinitions>X265_VERSION=2.0;WIN32;_WINDOWS;X265_ARCH_X86=1;HAVE_INT_TYPES_H=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)</PreprocessorDefinitions>
11761176
<AdditionalIncludeDirectories>.\;..\source;..\source\Lib;..\source\common;..\source\encoder;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
11771177
<UseProcessorExtensions>SSE3</UseProcessorExtensions>
11781178
<C99Support>true</C99Support>
@@ -1216,7 +1216,7 @@ del $(OutDir)\include\x265_config.h
12161216
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_12b|Win32'">
12171217
<ClCompile>
12181218
<MultiProcessorCompilation>true</MultiProcessorCompilation>
1219-
<PreprocessorDefinitions>X265_VERSION=1.9;WIN32;_WINDOWS;X265_ARCH_X86=1;HAVE_INT_TYPES_H=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)</PreprocessorDefinitions>
1219+
<PreprocessorDefinitions>X265_VERSION=2.0;WIN32;_WINDOWS;X265_ARCH_X86=1;HAVE_INT_TYPES_H=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)</PreprocessorDefinitions>
12201220
<AdditionalIncludeDirectories>.\;..\source;..\source\Lib;..\source\common;..\source\encoder;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
12211221
<UseProcessorExtensions>SSE3</UseProcessorExtensions>
12221222
<C99Support>true</C99Support>
@@ -1261,7 +1261,7 @@ del $(OutDir)\include\x265_config.h
12611261
<BufferSecurityCheck>false</BufferSecurityCheck>
12621262
<FloatingPointModel>Fast</FloatingPointModel>
12631263
<FloatingPointExceptions>false</FloatingPointExceptions>
1264-
<PreprocessorDefinitions>X265_VERSION=1.9;WIN32;_WINDOWS;X265_ARCH_X86=1;HAVE_INT_TYPES_H=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)</PreprocessorDefinitions>
1264+
<PreprocessorDefinitions>X265_VERSION=2.0;WIN32;_WINDOWS;X265_ARCH_X86=1;HAVE_INT_TYPES_H=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)</PreprocessorDefinitions>
12651265
<AdditionalIncludeDirectories>.\;..\source;..\source\Lib;..\source\common;..\source\encoder;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
12661266
<UseProcessorExtensions>SSE3</UseProcessorExtensions>
12671267
<C99Support>true</C99Support>
@@ -1295,7 +1295,7 @@ del $(OutDir)\include\x265_config.h
12951295
<ClCompile>
12961296
<WarningLevel>Level3</WarningLevel>
12971297
<MultiProcessorCompilation>true</MultiProcessorCompilation>
1298-
<PreprocessorDefinitions>X265_VERSION=1.9;WIN32;_WINDOWS;X265_ARCH_X86=1;HAVE_INT_TYPES_H=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)</PreprocessorDefinitions>
1298+
<PreprocessorDefinitions>X265_VERSION=2.0;WIN32;_WINDOWS;X265_ARCH_X86=1;HAVE_INT_TYPES_H=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)</PreprocessorDefinitions>
12991299
<AdditionalIncludeDirectories>.\;..\source;..\source\Lib;..\source\common;..\source\encoder;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
13001300
<UseProcessorExtensions>SSE3</UseProcessorExtensions>
13011301
<C99Support>true</C99Support>
@@ -1339,7 +1339,7 @@ del $(OutDir)\include\x265_config.h
13391339
<BufferSecurityCheck>false</BufferSecurityCheck>
13401340
<FloatingPointModel>Fast</FloatingPointModel>
13411341
<FloatingPointExceptions>false</FloatingPointExceptions>
1342-
<PreprocessorDefinitions>X265_VERSION=1.9;WIN32;_WINDOWS;X265_ARCH_X86=1;HAVE_INT_TYPES_H=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)</PreprocessorDefinitions>
1342+
<PreprocessorDefinitions>X265_VERSION=2.0;WIN32;_WINDOWS;X265_ARCH_X86=1;HAVE_INT_TYPES_H=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)</PreprocessorDefinitions>
13431343
<AdditionalIncludeDirectories>.\;..\source;..\source\Lib;..\source\common;..\source\encoder;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
13441344
<UseProcessorExtensions>SSE3</UseProcessorExtensions>
13451345
<C99Support>true</C99Support>
@@ -1373,7 +1373,7 @@ del $(OutDir)\include\x265_config.h
13731373
<ClCompile>
13741374
<WarningLevel>Level3</WarningLevel>
13751375
<MultiProcessorCompilation>true</MultiProcessorCompilation>
1376-
<PreprocessorDefinitions>X265_VERSION=1.9;WIN32;_WINDOWS;X265_ARCH_X86=1;HAVE_INT_TYPES_H=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)</PreprocessorDefinitions>
1376+
<PreprocessorDefinitions>X265_VERSION=2.0;WIN32;_WINDOWS;X265_ARCH_X86=1;HAVE_INT_TYPES_H=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)</PreprocessorDefinitions>
13771377
<AdditionalIncludeDirectories>.\;..\source;..\source\Lib;..\source\common;..\source\encoder;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
13781378
<UseProcessorExtensions>SSE3</UseProcessorExtensions>
13791379
<C99Support>true</C99Support>
@@ -1656,4 +1656,5 @@ del $(OutDir)\include\x265_config.h
16561656
<ImportGroup Label="ExtensionTargets">
16571657
<Import Project="$(VCTargetsPath)\BuildCustomizations\vsyasm.targets" />
16581658
</ImportGroup>
1659-
</Project>
1659+
</Project>
1660+

SMP/x265.rc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#include <winresrc.h>
22

33
VS_VERSION_INFO VERSIONINFO
4-
FILEVERSION 1,9,0,0
5-
PRODUCTVERSION 1,9,0,0
4+
FILEVERSION 2,0,0,0
5+
PRODUCTVERSION 2,0,0,0
66
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
77
FILEOS VOS_NT_WINDOWS32
88
#ifdef OPENOBEX_EXPORTS
@@ -17,12 +17,12 @@ VS_VERSION_INFO VERSIONINFO
1717
BLOCK "04090000"
1818
BEGIN
1919
VALUE "FileDescription", "HEVC video encoder"
20-
VALUE "FileVersion", "1.9"
20+
VALUE "FileVersion", "2.0"
2121
VALUE "InternalName", "x265"
2222
VALUE "LegalCopyright", "Multicoreware: GPLv2 or commercial"
2323
VALUE "OriginalFilename", "libx265.dll"
2424
VALUE "ProductName", "x265"
25-
VALUE "ProductVersion", "1.9"
25+
VALUE "ProductVersion", "2.0"
2626
END
2727
END
2828
BLOCK "VarFileInfo"

SMP/x265_config.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@
2929
/* Incremented each time public API is changed, X265_BUILD is used as
3030
* the shared library SONAME on platforms which support it. It also
3131
* prevents linking against a different version of the static lib */
32-
#define X265_BUILD 79
32+
#define X265_BUILD 87
3333

3434
#endif

0 commit comments

Comments
 (0)