project: Update for 3.4 merge.

ShiftMediaProject · Jun 7, 2020 · 3ab9c78 · 3ab9c78
1 parent d403d2c
commit 3ab9c78
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 23 deletions.
diff --git a/SMP/libx265.def b/SMP/libx265.def
@@ -1,5 +1,5 @@
 EXPORTS
-x265_encoder_open_188
+x265_encoder_open_192
 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_188
+x265_api_get_192
 x265_api_query
 x265_encoder_intra_refresh
 x265_encoder_ctu_info

diff --git a/SMP/libx265.vcxproj b/SMP/libx265.vcxproj
diff --git a/SMP/libx265.vcxproj.filters b/SMP/libx265.vcxproj.filters
@@ -228,6 +228,9 @@
     <ClInclude Include="..\source\dynamicHDR10\json11\json11.h">
       <Filter>Header Files\source\dynamicHDR10\json11</Filter>
     </ClInclude>
+    <ClInclude Include="..\source\common\scaler.h">
+      <Filter>Header Files\source\common</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="libx265.def">
@@ -420,6 +423,9 @@
     <ClCompile Include="..\source\common\lowpassdct.cpp">
       <Filter>Source Files\common</Filter>
     </ClCompile>
+    <ClCompile Include="..\source\common\scaler.cpp">
+      <Filter>Source Files\common</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <NASM Include="..\source\common\x86\h4-ipfilter16.asm">

diff --git a/SMP/x265.rc b/SMP/x265.rc
@@ -1,8 +1,8 @@
 #include <winresrc.h>
 
 VS_VERSION_INFO VERSIONINFO
-  FILEVERSION    3,3,0,0
-  PRODUCTVERSION 3,3,0,0
+  FILEVERSION    3,4,0,0
+  PRODUCTVERSION 3,4,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.3"
+        VALUE "FileVersion",      "3.4"
         VALUE "InternalName",     "x265"
         VALUE "LegalCopyright",   "Multicoreware: GPLv2 or commercial"
         VALUE "OriginalFilename", "libx265.dll"
         VALUE "ProductName",      "x265"
-        VALUE "ProductVersion",   "3.3"
+        VALUE "ProductVersion",   "3.4"
       END
     END
     BLOCK "VarFileInfo"

diff --git 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 188
+#define X265_BUILD 192
 
 #endif
diff --git a/SMP/x265cli.vcxproj b/SMP/x265cli.vcxproj
@@ -19,6 +19,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\source\abrEncApp.h" />
     <ClInclude Include="..\source\compat\getopt\getopt.h" />
     <ClInclude Include="..\source\input\input.h" />
     <ClInclude Include="..\source\input\y4m.h" />
@@ -35,6 +36,7 @@
     <ResourceCompile Include="x265.rc" />
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="..\source\abrEncApp.cpp" />
     <ClCompile Include="..\source\compat\getopt\getopt.c" />
     <ClCompile Include="..\source\input\input.cpp" />
     <ClCompile Include="..\source\input\y4m.cpp">
@@ -53,6 +55,7 @@
     <ClCompile Include="..\source\x265.cpp">
       <PreprocessorDefinitions>_CRT_DECLARE_GLOBAL_VARIABLES_DIRECTLY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
+    <ClCompile Include="..\source\x265cli.cpp" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{23B73CAF-85E7-442F-AACA-D0ECDDA50E1A}</ProjectGuid>

diff --git a/SMP/x265cli.vcxproj.filters b/SMP/x265cli.vcxproj.filters
@@ -63,6 +63,9 @@
     <ClInclude Include="..\source\output\reconplay.h">
       <Filter>Header Files\output</Filter>
     </ClInclude>
+    <ClInclude Include="..\source\abrEncApp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="x265.rc">
@@ -100,5 +103,11 @@
     <ClCompile Include="..\source\output\raw.cpp">
       <Filter>Source Files\output</Filter>
     </ClCompile>
+    <ClCompile Include="..\source\x265cli.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\source\abrEncApp.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>