project: Update for 2.5 merge.

ShiftMediaProject · Jul 16, 2017 · dee3c6e · dee3c6e
1 parent 1eb36fa
commit dee3c6e
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 29 deletions.
diff --git a/SMP/libx265.def b/SMP/libx265.def
@@ -1,5 +1,5 @@
 EXPORTS
-x265_encoder_open_116
+x265_encoder_open_130
 x265_param_default
 x265_param_default_preset
 x265_param_parse
@@ -20,6 +20,6 @@ x265_encoder_get_stats
 x265_encoder_log
 x265_encoder_close
 x265_cleanup
-x265_api_get_116
+x265_api_get_130
 x265_api_query
 x265_encoder_intra_refresh
diff --git a/SMP/libx265.vcxproj b/SMP/libx265.vcxproj
diff --git a/SMP/libx265.vcxproj.filters b/SMP/libx265.vcxproj.filters
@@ -195,6 +195,12 @@
     <ClInclude Include="..\source\encoder\search.h">
       <Filter>Header Files\source\encoder</Filter>
     </ClInclude>
+    <ClInclude Include="..\source\common\x86\seaintegral.h">
+      <Filter>Header Files\source\common\x86</Filter>
+    </ClInclude>
+    <ClInclude Include="..\source\x265-extras.h">
+      <Filter>Header Files\source</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="libx265.def">
@@ -369,6 +375,9 @@
     <ClCompile Include="..\source\encoder\sao.cpp">
       <Filter>Source Files\encoder</Filter>
     </ClCompile>
+    <ClCompile Include="..\source\x265-extras.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <YASM Include="..\source\common\x86\intrapred8.asm">
@@ -428,5 +437,8 @@
     <YASM Include="..\source\common\x86\ipfilter16.asm">
       <Filter>Source Files\common\x86</Filter>
     </YASM>
+    <YASM Include="..\source\common\x86\seaintegral.asm">
+      <Filter>Source Files\common\x86</Filter>
+    </YASM>
   </ItemGroup>
 </Project>
diff --git a/SMP/x265.rc b/SMP/x265.rc
@@ -1,8 +1,8 @@
 #include <winresrc.h>
 
 VS_VERSION_INFO VERSIONINFO
-  FILEVERSION    2,4,0,0
-  PRODUCTVERSION 2,4,0,0
+  FILEVERSION    2,5,0,0
+  PRODUCTVERSION 2,5,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",      "2.4"
+        VALUE "FileVersion",      "2.5"
         VALUE "InternalName",     "x265"
         VALUE "LegalCopyright",   "Multicoreware: GPLv2 or commercial"
         VALUE "OriginalFilename", "libx265.dll"
         VALUE "ProductName",      "x265"
-        VALUE "ProductVersion",   "2.4"
+        VALUE "ProductVersion",   "2.5"
       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 116
+#define X265_BUILD 130
 
 #endif
diff --git a/SMP/x265cli.vcxproj b/SMP/x265cli.vcxproj
@@ -48,7 +48,6 @@
     <ClCompile Include="..\source\output\reconplay.cpp" />
     <ClCompile Include="..\source\output\y4m.cpp" />
     <ClCompile Include="..\source\output\yuv.cpp" />
-    <ClCompile Include="..\source\x265-extras.cpp" />
     <ClCompile Include="..\source\x265.cpp">
       <PreprocessorDefinitions>_CRT_DECLARE_GLOBAL_VARIABLES_DIRECTLY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>

diff --git a/SMP/x265cli.vcxproj.filters b/SMP/x265cli.vcxproj.filters
@@ -100,8 +100,5 @@
     <ClCompile Include="..\source\output\raw.cpp">
       <Filter>Source Files\output</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\x265-extras.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
   </ItemGroup>
 </Project>