changeset 12330:bf328c1b4df9 draft stable

remove unused asmname from x265_param
author Ma0 <mateuszb@poczta.onet.pl>
date Fri, 13 Apr 2018 09:50:26 +0200
parents 54ff74d2b635
children 1b38042f34a6
files source/CMakeLists.txt source/common/param.cpp source/x265.h
diffstat 3 files changed, 1 insertions(+-), 3 deletions(-) [+]
line wrap: on
line diff
--- a/source/CMakeLists.txt	Thu Apr 12 18:23:20 2018 +0530
+++ b/source/CMakeLists.txt	Fri Apr 13 09:50:26 2018 +0200
@@ -29,7 +29,7 @@ option(NATIVE_BUILD "Target the build CP
 option(STATIC_LINK_CRT "Statically link C runtime for release builds" OFF)
 mark_as_advanced(FPROFILE_USE FPROFILE_GENERATE NATIVE_BUILD)
 # X265_BUILD must be incremented each time the public API is changed
-set(X265_BUILD 158)
+set(X265_BUILD 159)
 configure_file("${PROJECT_SOURCE_DIR}/x265.def.in"
                "${PROJECT_BINARY_DIR}/x265.def")
 configure_file("${PROJECT_SOURCE_DIR}/x265_config.h.in"
--- a/source/common/param.cpp	Thu Apr 12 18:23:20 2018 +0530
+++ b/source/common/param.cpp	Fri Apr 13 09:50:26 2018 +0200
@@ -615,7 +615,6 @@ int x265_param_parse(x265_param* p, cons
     if (0) ;
     OPT("asm")
     {
-        sscanf(value, "%s", p->asmname);
         if (strcmp(value, "avx512")==0)
         {
             p->bEnableavx512 = 1;
--- a/source/x265.h	Thu Apr 12 18:23:20 2018 +0530
+++ b/source/x265.h	Fri Apr 13 09:50:26 2018 +0200
@@ -636,7 +636,6 @@ typedef struct x265_param
      *  avx512 capabilities. 
      *  Ensure to use --asm avx512 if you need to encode with avx512 assembly primitives*/
     int     bEnableavx512;
-    char*   asmname;
     /*== Parallelism Features ==*/
 
     /* Number of concurrently encoded frames between 1 and X265_MAX_FRAME_THREADS