@@ -1,4 +1,47 @@

 -------------------------------------------------------------------

+Fri Nov 27 18:21:04 UTC 2015 - aloisio@gmx.com

+

+- Update to version 1.8:

+  API Changes:

+  * Experimental support for Main12 is now enabled. Partial

+    assembly support exists.

+  * Main12 and Intra/Still picture profiles are now supported.

+    Still picture profile is detected based on

+    x265_param::totalFrames.

+  * Three classes of encoding statistics are now available

+    through the API.

+    + x265_stats - contains encoding statistics, available

+      through x265_encoder_get_stats()

+    + x265_frame_stats and x265_cu_stats - contains frame

+      encoding statistics, available through recon x265_picture

+  * --csv

+  * x265_encoder_log() is now deprecated

+  * x265_param::csvfn is also deprecated

+  * --log-level now controls only console logging, frame

+    level console logging has been removed.

+  * Support added for new color transfer characteristic ARIB

+    STD-B67

+  New Features:

+  * limit-refs

+    + This feature limits the references analysed for

+      individual CUS.

+    + Provides a nice tradeoff between efficiency and

+      performance.

+    + aq-mode 3

+  * A new aq-mode that provides additional biasing for

+    low-light conditions.

+  * An improved scene cut detection logic that allows

+    ratecontrol to manage visual quality at fade-ins and

+    fade-outs better.

+  Preset and Tune Options:

+  * tune grain

+    + Increases psyRdoq strength to 10.0, and rdoq-level to 2.

+    + qg-size

+  * Default value changed to 32.

+- soname bump to 68

+- Reworked arm.patch for 1.8

+

+-------------------------------------------------------------------

 Fri May 29 09:11:02 UTC 2015 - aloisio@gmx.com

 - soname bump to 59

​

@@ -1,10 +1,10 @@

 # based on the spec file from https://build.opensuse.org/package/view_file/home:Simmphonie/libx265/

 Name:           x265

-%define soname  59

+%define soname  68

 %define libname lib%{name}

 %define libsoname %{libname}-%{soname}

-Version:        1.7

+Version:        1.8

 Release:        0

 License:        GPL-2.0+

 Summary:        A free h265/HEVC encoder - encoder binary

@@ -43,9 +43,9 @@

 streams. 

 %prep

-%setup -q -n "%{name}_%{version}/build/linux"

+%setup -q -n "%{name}_11047/build/linux"

 cd ../..

-%patch0

+%patch0 -p1

 cd -

 %define FAKE_BUILDDATE %(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')

 sed -i -e "s/0.0/%{soname}.0/g" ../../source/cmake/version.cmake

​

@@ -1,9 +1,11 @@

---- source/CMakeLists.txt.orig 2015-04-28 21:43:18.585528552 +0200

-+++ source/CMakeLists.txt  2015-04-28 21:47:14.995334232 +0200

-@@ -50,10 +50,18 @@

-         set(X64 1)

-         add_definitions(-DX86_64=1)

-     endif()

+Index: x265_11047/source/CMakeLists.txt

+===================================================================

+--- x265_11047.orig/source/CMakeLists.txt

++++ x265_11047/source/CMakeLists.txt

+@@ -56,10 +56,22 @@ elseif(POWERMATCH GREATER "-1")

+     message(STATUS "Detected POWER target processor")

+     set(POWER 1)

+     add_definitions(-DX265_ARCH_POWER=1)

 +elseif(${SYSPROC} MATCHES "armv5.*")

 +    message(STATUS "Detected ARMV5 system processor")

 +    set(ARMV5 1)

@@ -19,10 +21,14 @@

 +    message(STATUS "Detected ARMV7 system processor")

 +    set(ARMV7 1)

 +    add_definitions(-DX265_ARCH_ARM=1 -DHAVE_ARMV6=1 -DHAVE_NEON=0)

++elseif(${SYSPROC} STREQUAL "aarch64")

++    message(STATUS "Detected AArch64 system processor")

++    set(ARMV7 1)

++    add_definitions(-DX265_ARCH_ARM=1 -DHAVE_ARMV6=1 -DHAVE_NEON=0)

  else()

      message(STATUS "CMAKE_SYSTEM_PROCESSOR value `${CMAKE_SYSTEM_PROCESSOR}` is unknown")

      message(STATUS "Please add this value near ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE}")

-@@ -155,8 +163,8 @@

+@@ -169,8 +181,8 @@ if(GCC)

      elseif(X86 AND NOT X64)

          add_definitions(-march=i686)

      endif()

@@ -33,8 +39,10 @@

      endif()

      if(FPROFILE_GENERATE)

          if(INTEL_CXX)

---- source/common/cpu.cpp.orig 2015-04-28 21:47:44.634923269 +0200

-+++ source/common/cpu.cpp  2015-04-28 21:49:50.305468867 +0200

+Index: x265_11047/source/common/cpu.cpp

+===================================================================

+--- x265_11047.orig/source/common/cpu.cpp

++++ x265_11047/source/common/cpu.cpp

 @@ -37,7 +37,7 @@

  #include <machine/cpu.h>

  #endif

@@ -44,20 +52,3 @@

  #include <signal.h>

  #include <setjmp.h>

  static sigjmp_buf jmpbuf;

-@@ -340,7 +340,6 @@

-     }

- 

-     canjump = 1;

--    x265_cpu_neon_test();

-     canjump = 0;

-     signal(SIGILL, oldsig);

- #endif // if !HAVE_NEON

-@@ -356,7 +355,7 @@

-     // which may result in incorrect detection and the counters stuck enabled.

-     // right now Apple does not seem to support performance counters for this test

- #ifndef __MACH__

--    flags |= x265_cpu_fast_neon_mrc_test() ? X265_CPU_FAST_NEON_MRC : 0;

-+    //flags |= x265_cpu_fast_neon_mrc_test() ? X265_CPU_FAST_NEON_MRC : 0;

- #endif

-     // TODO: write dual issue test? currently it's A8 (dual issue) vs. A9 (fast mrc)

- #endif // if HAVE_ARMV6

​

@@ -1,1 +1,1 @@

-libx265-59

+libx265-68

​

@@ -1,79 +0,0 @@

-/*****************************************************************************

- * Copyright (C) 2013 x265 project

- *

- * Authors: Selvakumar Nithiyaruban <selvakumar@multicorewareinc.com>

- *

- * This program is free software; you can redistribute it and/or modify

- * it under the terms of the GNU General Public License as published by

- * the Free Software Foundation; either version 2 of the License, or

- * (at your option) any later version.

- *

- * This program is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU General Public License for more details.

- *

- * You should have received a copy of the GNU General Public License

- * along with this program; if not, write to the Free Software

- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.

- *

- * This program is also available under a commercial proprietary license.

- * For more information, contact us at license @ x265.com.

- *****************************************************************************/

-

-#include "filters.h"

-#include "common.h"

-

-/* The dithering algorithm is based on Sierra-2-4A error diffusion. */

-void ditherPlane(pixel *dst, int dstStride, uint16_t *src, int srcStride,

-                 int width, int height, int16_t *errors, int bitDepth)

-{

-    const int lShift = 16 - bitDepth;

-    const int rShift = 16 - bitDepth + 2;

-    const int half = (1 << (16 - bitDepth + 1));

-    const int pixelMax = (1 << bitDepth) - 1;

-

-    memset(errors, 0, (width + 1) * sizeof(int16_t));

-    int pitch = 1;

-    for (int y = 0; y < height; y++, src += srcStride, dst += dstStride)

-    {

-        int16_t err = 0;

-        for (int x = 0; x < width; x++)

-        {

-            err = err * 2 + errors[x] + errors[x + 1];

-            dst[x * pitch] = (pixel)x265_clip3(0, pixelMax, ((src[x * 1] << 2) + err + half) >> rShift);

-            errors[x] = err = src[x * pitch] - (dst[x * pitch] << lShift);

-        }

-    }

-}

-

-void ditherImage(x265_picture& picIn, int picWidth, int picHeight, int16_t *errorBuf, int bitDepth)

-{

-    /* This portion of code is from readFrame in x264. */

-    for (int i = 0; i < x265_cli_csps[picIn.colorSpace].planes; i++)

-    {

-        if ((picIn.bitDepth & 7) && (picIn.bitDepth != 16))

-        {

-            /* upconvert non 16bit high depth planes to 16bit */

-            uint16_t *plane = (uint16_t*)picIn.planes[i];

-            uint32_t pixelCount = x265_picturePlaneSize(picIn.colorSpace, picWidth, picHeight, i);

-            int lShift = 16 - picIn.bitDepth;

-

-            /* This loop assumes width is equal to stride which

-               happens to be true for file reader outputs */

-            for (uint32_t j = 0; j < pixelCount; j++)

-            {

-                plane[j] = plane[j] << lShift;

-            }

-        }

-    }

-

-    for (int i = 0; i < x265_cli_csps[picIn.colorSpace].planes; i++)

-    {

-        int height = (int)(picHeight >> x265_cli_csps[picIn.colorSpace].height[i]);

-        int width = (int)(picWidth >> x265_cli_csps[picIn.colorSpace].width[i]);

-

-        ditherPlane(((pixel*)picIn.planes[i]), picIn.stride[i] / sizeof(pixel), ((uint16_t*)picIn.planes[i]),

-                    picIn.stride[i] / 2, width, height, errorBuf, bitDepth);

-    }

-}

​

@@ -1,31 +0,0 @@

-/*****************************************************************************

- * Copyright (C) 2013 x265 project

- *

- * Authors: Selvakumar Nithiyaruban <selvakumar@multicorewareinc.com>

- *

- * This program is free software; you can redistribute it and/or modify

- * it under the terms of the GNU General Public License as published by

- * the Free Software Foundation; either version 2 of the License, or

- * (at your option) any later version.

- *

- * This program is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU General Public License for more details.

- *

- * You should have received a copy of the GNU General Public License

- * along with this program; if not, write to the Free Software

- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.

- *

- * This program is also available under a commercial proprietary license.

- * For more information, contact us at license @ x265.com.

- *****************************************************************************/

-

-#ifndef X265_FILTERS_H

-#define X265_FILTERS_H

-

-#include "x265.h"

-

-void ditherImage(x265_picture&, int picWidth, int picHeight, int16_t *errorBuf, int bitDepth);

-

-#endif //X265_FILTERS_H

​

@@ -1,4 +1,5 @@

 repo: 09fe40627f03a0f9c3e6ac78b22ac93da23f9fdf

-node: 8425278def1edf0931dc33fc518e1950063e76b0

+node: 5dcc9d3a928c400b41a3547d7bfee10340519e56

 branch: stable

-tag: 1.7

+latesttag: 1.8

+latesttagdistance: 1

​

@@ -15,3 +15,5 @@

 5e604833c5aa605d0b6efbe5234492b5e7d8ac61 1.4

 9f0324125f53a12f766f6ed6f98f16e2f42337f4 1.5

 cbeb7d8a4880e4020c4545dd8e498432c3c6cad3 1.6

+8425278def1edf0931dc33fc518e1950063e76b0 1.7

+e27327f5da35c5feb660360336fdc94bd0afe719 1.8

​

@@ -0,0 +1,41 @@

+#!/bin/sh

+

+mkdir -p 8bit 10bit 12bit

+

+cd 12bit

+cmake ../../../source -DHIGH_BIT_DEPTH=ON -DEXPORT_C_API=OFF -DENABLE_SHARED=OFF -DENABLE_CLI=OFF -DMAIN12=ON

+make ${MAKEFLAGS}

+

+cd ../10bit

+cmake ../../../source -DHIGH_BIT_DEPTH=ON -DEXPORT_C_API=OFF -DENABLE_SHARED=OFF -DENABLE_CLI=OFF

+make ${MAKEFLAGS}

+

+cd ../8bit

+ln -sf ../10bit/libx265.a libx265_main10.a

+ln -sf ../12bit/libx265.a libx265_main12.a

+cmake ../../../source -DEXTRA_LIB="x265_main10.a;x265_main12.a" -DEXTRA_LINK_FLAGS=-L. -DLINKED_10BIT=ON -DLINKED_12BIT=ON

+make ${MAKEFLAGS}

+

+# rename the 8bit library, then combine all three into libx265.a

+mv libx265.a libx265_main.a

+

+uname=`uname`

+if [ "$uname" = "Linux" ]

+then

+

+# On Linux, we use GNU ar to combine the static libraries together

+ar -M <<EOF

+CREATE libx265.a

+ADDLIB libx265_main.a

+ADDLIB libx265_main10.a

+ADDLIB libx265_main12.a

+SAVE

+END

+EOF

+

+else

+

+# Mac/BSD libtool

+libtool -static -o libx265.a libx265_main.a libx265_main10.a libx265_main12.a 2>/dev/null

+

+fi

​

@@ -0,0 +1,29 @@

+#!/bin/sh

+

+mkdir -p 8bit 10bit 12bit

+

+cd 12bit

+cmake -G "MSYS Makefiles" ../../../source -DHIGH_BIT_DEPTH=ON -DEXPORT_C_API=OFF -DENABLE_SHARED=OFF -DENABLE_CLI=OFF -DMAIN12=ON

+make ${MAKEFLAGS}

+cp libx265.a ../8bit/libx265_main12.a

+

+cd ../10bit

+cmake -G "MSYS Makefiles" ../../../source -DHIGH_BIT_DEPTH=ON -DEXPORT_C_API=OFF -DENABLE_SHARED=OFF -DENABLE_CLI=OFF

+make ${MAKEFLAGS}

+cp libx265.a ../8bit/libx265_main10.a

+

+cd ../8bit

+cmake -G "MSYS Makefiles" ../../../source -DEXTRA_LIB="x265_main10.a;x265_main12.a" -DEXTRA_LINK_FLAGS=-L. -DLINKED_10BIT=ON -DLINKED_12BIT=ON

+make ${MAKEFLAGS}

+

+# rename the 8bit library, then combine all three into libx265.a using GNU ar

+mv libx265.a libx265_main.a

+

+ar -M <<EOF

+CREATE libx265.a

+ADDLIB libx265_main.a

+ADDLIB libx265_main10.a

+ADDLIB libx265_main12.a

+SAVE

+END

+EOF

​

@@ -0,0 +1,44 @@

+@echo off

+if "%VS100COMNTOOLS%" == "" (

+  msg "%username%" "Visual Studio 10 not detected"

+  exit 1

+)

+

+call "%VS100COMNTOOLS%\..\..\VC\vcvarsall.bat"

+

+@mkdir 12bit

+@mkdir 10bit

+@mkdir 8bit

+

+@cd 12bit

+cmake -G "Visual Studio 10 Win64" ../../../source -DHIGH_BIT_DEPTH=ON -DEXPORT_C_API=OFF -DENABLE_SHARED=OFF -DENABLE_CLI=OFF -DMAIN12=ON

+if exist x265.sln (

+  MSBuild /property:Configuration="Release" x265.sln

+  copy/y Release\x265-static.lib ..\8bit\x265-static-main12.lib

+)

+

+@cd ..\10bit

+cmake -G "Visual Studio 10 Win64" ../../../source -DHIGH_BIT_DEPTH=ON -DEXPORT_C_API=OFF -DENABLE_SHARED=OFF -DENABLE_CLI=OFF

+if exist x265.sln (

+  MSBuild /property:Configuration="Release" x265.sln

+  copy/y Release\x265-static.lib ..\8bit\x265-static-main10.lib

+)

+

+@cd ..\8bit

+if not exist x265-static-main10.lib (

+  msg "%username%" "10bit build failed"

+  exit 1

+)

+if not exist x265-static-main12.lib (

+  msg "%username%" "12bit build failed"

+  exit 1

+)

+cmake -G "Visual Studio 10 Win64" ../../../source -DEXTRA_LIB="x265-static-main10.lib;x265-static-main12.lib" -DLINKED_10BIT=ON -DLINKED_12BIT=ON

+if exist x265.sln (

+  MSBuild /property:Configuration="Release" x265.sln

+  :: combine static libraries (ignore warnings caused by winxp.cpp hacks)

+  move Release\x265-static.lib x265-static-main.lib

+  LIB.EXE /ignore:4006 /ignore:4221 /OUT:Release\x265-static.lib x265-static-main.lib x265-static-main10.lib x265-static-main12.lib

+)

+

+pause

​

@@ -0,0 +1,44 @@

+@echo off

+if "%VS110COMNTOOLS%" == "" (

+  msg "%username%" "Visual Studio 11 not detected"

+  exit 1

+)

+

+call "%VS110COMNTOOLS%\..\..\VC\vcvarsall.bat"

+

+@mkdir 12bit

+@mkdir 10bit

+@mkdir 8bit

+

+@cd 12bit

+cmake -G "Visual Studio 11 Win64" ../../../source -DHIGH_BIT_DEPTH=ON -DEXPORT_C_API=OFF -DENABLE_SHARED=OFF -DENABLE_CLI=OFF -DMAIN12=ON

+if exist x265.sln (

+  MSBuild /property:Configuration="Release" x265.sln

+  copy/y Release\x265-static.lib ..\8bit\x265-static-main12.lib

+)

+

+@cd ..\10bit

+cmake -G "Visual Studio 11 Win64" ../../../source -DHIGH_BIT_DEPTH=ON -DEXPORT_C_API=OFF -DENABLE_SHARED=OFF -DENABLE_CLI=OFF

+if exist x265.sln (

+  MSBuild /property:Configuration="Release" x265.sln

+  copy/y Release\x265-static.lib ..\8bit\x265-static-main10.lib

+)

+

+@cd ..\8bit

+if not exist x265-static-main10.lib (

+  msg "%username%" "10bit build failed"

+  exit 1

+)

+if not exist x265-static-main12.lib (

+  msg "%username%" "12bit build failed"

+  exit 1

+)

+cmake -G "Visual Studio 11 Win64" ../../../source -DEXTRA_LIB="x265-static-main10.lib;x265-static-main12.lib" -DLINKED_10BIT=ON -DLINKED_12BIT=ON

+if exist x265.sln (

+  MSBuild /property:Configuration="Release" x265.sln

+  :: combine static libraries (ignore warnings caused by winxp.cpp hacks)

+  move Release\x265-static.lib x265-static-main.lib

+  LIB.EXE /ignore:4006 /ignore:4221 /OUT:Release\x265-static.lib x265-static-main.lib x265-static-main10.lib x265-static-main12.lib

+)

+

+pause

​

@@ -0,0 +1,44 @@

+@echo off

+if "%VS120COMNTOOLS%" == "" (

+  msg "%username%" "Visual Studio 12 not detected"

+  exit 1

+)

+

+call "%VS120COMNTOOLS%\..\..\VC\vcvarsall.bat"

+

+@mkdir 12bit

+@mkdir 10bit

+@mkdir 8bit

+

+@cd 12bit

+cmake -G "Visual Studio 12 Win64" ../../../source -DHIGH_BIT_DEPTH=ON -DEXPORT_C_API=OFF -DENABLE_SHARED=OFF -DENABLE_CLI=OFF -DMAIN12=ON

+if exist x265.sln (

+  MSBuild /property:Configuration="Release" x265.sln

+  copy/y Release\x265-static.lib ..\8bit\x265-static-main12.lib

+)

+

+@cd ..\10bit

+cmake -G "Visual Studio 12 Win64" ../../../source -DHIGH_BIT_DEPTH=ON -DEXPORT_C_API=OFF -DENABLE_SHARED=OFF -DENABLE_CLI=OFF

+if exist x265.sln (

+  MSBuild /property:Configuration="Release" x265.sln

+  copy/y Release\x265-static.lib ..\8bit\x265-static-main10.lib

+)

+

+@cd ..\8bit

+if not exist x265-static-main10.lib (

+  msg "%username%" "10bit build failed"

+  exit 1

+)

+if not exist x265-static-main12.lib (

+  msg "%username%" "12bit build failed"

+  exit 1

+)

+cmake -G "Visual Studio 12 Win64" ../../../source -DEXTRA_LIB="x265-static-main10.lib;x265-static-main12.lib" -DLINKED_10BIT=ON -DLINKED_12BIT=ON

+if exist x265.sln (

+  MSBuild /property:Configuration="Release" x265.sln

+  :: combine static libraries (ignore warnings caused by winxp.cpp hacks)

+  move Release\x265-static.lib x265-static-main.lib

+  LIB.EXE /ignore:4006 /ignore:4221 /OUT:Release\x265-static.lib x265-static-main.lib x265-static-main10.lib x265-static-main12.lib

+)

+

+pause

​

@@ -0,0 +1,44 @@

+@echo off

+if "%VS90COMNTOOLS%" == "" (

+  msg "%username%" "Visual Studio 9 not detected"

+  exit 1

+)

+

+call "%VS90COMNTOOLS%\..\..\VC\vcvarsall.bat"

+

+@mkdir 12bit

+@mkdir 10bit

+@mkdir 8bit

+

+@cd 12bit

+cmake -G "Visual Studio 9 2008 Win64" ../../../source -DHIGH_BIT_DEPTH=ON -DEXPORT_C_API=OFF -DENABLE_SHARED=OFF -DENABLE_CLI=OFF -DMAIN12=ON

+if exist x265.sln (

+  MSBuild /property:Configuration="Release" x265.sln

+  copy/y Release\x265-static.lib ..\8bit\x265-static-main12.lib

+)

+

+@cd ..\10bit

+cmake -G "Visual Studio 9 2008 Win64" ../../../source -DHIGH_BIT_DEPTH=ON -DEXPORT_C_API=OFF -DENABLE_SHARED=OFF -DENABLE_CLI=OFF

+if exist x265.sln (

+  MSBuild /property:Configuration="Release" x265.sln

+  copy/y Release\x265-static.lib ..\8bit\x265-static-main10.lib

+)

+

+@cd ..\8bit

+if not exist x265-static-main10.lib (

+  msg "%username%" "10bit build failed"

+  exit 1

+)

+if not exist x265-static-main12.lib (

+  msg "%username%" "12bit build failed"

+  exit 1

+)

+cmake -G "Visual Studio 9 2008 Win64" ../../../source -DEXTRA_LIB="x265-static-main10.lib;x265-static-main12.lib" -DLINKED_10BIT=ON -DLINKED_12BIT=ON

+if exist x265.sln (

+  MSBuild /property:Configuration="Release" x265.sln

+  :: combine static libraries (ignore warnings caused by winxp.cpp hacks)

+  move Release\x265-static.lib x265-static-main.lib

+  LIB.EXE /ignore:4006 /ignore:4221 /OUT:Release\x265-static.lib x265-static-main.lib x265-static-main10.lib x265-static-main12.lib

+)

+

+pause

​

@@ -41,9 +41,9 @@

 x265 will accept input pixels of any depth between 8 and 16 bits

 regardless of the depth of its internal pixels (8 or 10).  It will shift

 and mask input pixels as required to reach the internal depth. If

-downshifting is being performed using our CLI application, the

-:option:`--dither` option may be enabled to reduce banding. This feature

-is not available through the C interface.

+downshifting is being performed using our CLI application (to 8 bits),

+the :option:`--dither` option may be enabled to reduce banding. This

+feature is not available through the C interface.

 Encoder

 =======

@@ -159,7 +159,8 @@

    helps future-proof your code in many ways, but the x265 API is

    versioned in such a way that we prevent linkage against a build of

    x265 that does not match the version of the header you are compiling

-   against. This is function of the X265_BUILD macro.

+   against (unless you use x265_api_query() to acquire the library's

+   interfaces). This is function of the X265_BUILD macro.

 **x265_encoder_parameters()** may be used to get a copy of the param

 structure from the encoder after it has been opened, in order to see the

@@ -190,7 +191,7 @@

     *      presets is not recommended without a more fine-grained breakdown of

     *      parameters to take this into account. */

    int x265_encoder_reconfig(x265_encoder *, x265_param *);

-   

+

 Pictures

 ========

@@ -320,7 +321,8 @@

    provided, the encoder will fill it with data pertaining to the

    output picture corresponding to the output NALs, including the

    recontructed image, POC and decode timestamp. These pictures will be

-   in encode (or decode) order.

+   in encode (or decode) order. The encoder will also write corresponding 

+   frame encode statistics into **x265_frame_stats**.

 When the last of the raw input pictures has been sent to the encoder,

 **x265_encoder_encode()** must still be called repeatedly with a

@@ -338,15 +340,6 @@

 Cleanup

 =======

-At the end of the encode, the application will want to trigger logging

-of the final encode statistics, if :option:`--csv` had been specified::

-

-   /* x265_encoder_log:

-    *       write a line to the configured CSV file.  If a CSV filename was not

-    *       configured, or file open failed, or the log level indicated frame level

-    *       logging, this function will perform no write. */

-   void x265_encoder_log(x265_encoder *encoder, int argc, char **argv);

-

 Finally, the encoder must be closed in order to free all of its

 resources. An encoder that has been flushed cannot be restarted and

 reused. Once **x265_encoder_close()** has been called, the encoder

@@ -370,52 +363,150 @@

 Multi-library Interface

 =======================

-If your application might want to make a runtime selection between

-a number of libx265 libraries (perhaps 8bpp and 16bpp), then you will

-want to use the multi-library interface.

-

-Instead of directly using all of the **x265_** methods documented

-above, you query an x265_api structure from your libx265 and then use

-the function pointers within that structure of the same name, but

-without the **x265_** prefix. So **x265_param_default()** becomes

-**api->param_default()**. The key method is x265_api_get()::

-

-    /* x265_api_get:

-     *   Retrieve the programming interface for a linked x265 library.

-     *   May return NULL if no library is available that supports the

-     *   requested bit depth. If bitDepth is 0, the function is guarunteed

-     *   to return a non-NULL x265_api pointer from the system default

-     *   libx265 */

-    const x265_api* x265_api_get(int bitDepth);

-

-Note that using this multi-library API in your application is only the

-first step.

-

-Your application must link to one build of libx265 (statically or 

-dynamically) and this linked version of libx265 will support one 

-bit-depth (8 or 10 bits). 

-

-Your application must now request the API for the bitDepth you would 

-prefer the encoder to use (8 or 10). If the requested bitdepth is zero, 

-or if it matches the bitdepth of the system default libx265 (the 

-currently linked library), then this library will be used for encode.

-If you request a different bit-depth, the linked libx265 will attempt 

-to dynamically bind a shared library with a name appropriate for the 

-requested bit-depth:

-

-    8-bit:  libx265_main.dll

-    10-bit: libx265_main10.dll

-

-    (the shared library extension is obviously platform specific. On

-    Linux it is .so while on Mac it is .dylib)

-

-For example on Windows, one could package together an x265.exe

-statically linked against the 8bpp libx265 together with a

-libx265_main10.dll in the same folder, and this executable would be able

-to encode main and main10 bitstreams.

-

-On Linux, x265 packagers could install 8bpp static and shared libraries

-under the name libx265 (so all applications link against 8bpp libx265)

-and then also install libx265_main10.so (symlinked to its numbered solib).

-Thus applications which use x265_api_get() will be able to generate main

-or main10 bitstreams.

+If your application might want to make a runtime bit-depth selection, it

+will need to use one of these bit-depth introspection interfaces which

+returns an API structure containing the public function entry points and

+constants.

+

+Instead of directly using all of the **x265_** methods documented above,

+you query an x265_api structure from your libx265 and then use the

+function pointers of the same name (minus the **x265_** prefix) within

+that structure.  For instance **x265_param_default()** becomes

+**api->param_default()**.

+

+x265_api_get

+------------

+

+The first bit-depth instrospecton method is x265_api_get(). It designed

+for applications that might statically link with libx265, or will at

+least be tied to a particular SONAME or API version::

+

+   /* x265_api_get:

+    *   Retrieve the programming interface for a linked x265 library.

+    *   May return NULL if no library is available that supports the

+    *   requested bit depth. If bitDepth is 0, the function is guarunteed

+    *   to return a non-NULL x265_api pointer from the system default

+    *   libx265 */

+   const x265_api* x265_api_get(int bitDepth);

+

+Like **x265_encoder_encode()**, this function has the build number

+automatically appended to the function name via macros. This ties your

+application to a particular binary API version of libx265 (the one you

+compile against). If you attempt to link with a libx265 with a different

+API version number, the link will fail.

+

+Obviously this has no meaningful effect on applications which statically

+link to libx265.

+

+x265_api_query

+--------------

+

+The second bit-depth introspection method is designed for applications

+which need more flexibility in API versioning.  If you use

+**x265_api_query()** and dynamically link to libx265 at runtime (using

+dlopen() on POSIX or LoadLibrary() on Windows) your application is no

+longer directly tied to the API version that it was compiled against::

+

+   /* x265_api_query:

+    *   Retrieve the programming interface for a linked x265 library, like

+    *   x265_api_get(), except this function accepts X265_BUILD as the second

+    *   argument rather than using the build number as part of the function name.

+    *   Applications which dynamically link to libx265 can use this interface to

+    *   query the library API and achieve a relative amount of version skew

+    *   flexibility. The function may return NULL if the library determines that

+    *   the apiVersion that your application was compiled against is not compatible

+    *   with the library you have linked with.

+    *

+    *   api_major_version will be incremented any time non-backward compatible

+    *   changes are made to any public structures or functions. If

+    *   api_major_version does not match X265_MAJOR_VERSION from the x265.h your

+    *   application compiled against, your application must not use the returned

+    *   x265_api pointer.

+    *

+    *   Users of this API *must* also validate the sizes of any structures which

+    *   are not treated as opaque in application code. For instance, if your

+    *   application dereferences a x265_param pointer, then it must check that

+    *   api->sizeof_param matches the sizeof(x265_param) that your application

+    *   compiled with. */

+   const x265_api* x265_api_query(int bitDepth, int apiVersion, int* err);

+

+A number of validations must be performed on the returned API structure

+in order to determine if it is safe for use by your application. If you

+do not perform these checks, your application is liable to crash::

+

+   if (api->api_major_version != X265_MAJOR_VERSION) /* do not use */

+   if (api->sizeof_param != sizeof(x265_param))      /* do not use */

+   if (api->sizeof_picture != sizeof(x265_picture))  /* do not use */

+   if (api->sizeof_stats != sizeof(x265_stats))      /* do not use */

+   if (api->sizeof_zone != sizeof(x265_zone))        /* do not use */

+   etc.

+

+Note that if your application does not directly allocate or dereference

+one of these structures, if it treats the structure as opaque or does

+not use it at all, then it can skip the size check for that structure.

+

+In particular, if your application uses api->param_alloc(),

+api->param_free(), api->param_parse(), etc and never directly accesses

+any x265_param fields, then it can skip the check on the

+sizeof(x265_parm) and thereby ignore changes to that structure (which

+account for a large percentage of X265_BUILD bumps).

+

+Build Implications

​

@@ -28,7 +28,7 @@

 Generally, when an option expects a string value from a list of strings

 the user may specify the integer ordinal of the value they desire. ie:

-:option:`--log-level` 4 is equivalent to :option:`--log-level` debug.

+:option:`--log-level` 3 is equivalent to :option:`--log-level` debug.

 Executable Options

 ==================

@@ -52,6 +52,7 @@

    2. unable to open encoder

    3. unable to generate stream headers

    4. encoder abort

+   5. unable to open csv file

 Logging/Statistic Options

 =========================

@@ -67,9 +68,8 @@

    0. error

    1. warning

    2. info **(default)**

-   3. frame

-   4. debug

-   5. full

+   3. debug

+   4. full

 .. option:: --no-progress

@@ -80,9 +80,9 @@

 .. option:: --csv <filename>

    Writes encoding results to a comma separated value log file. Creates

-   the file if it doesnt already exist, else adds one line per run.  if

-   :option:`--log-level` is frame or above, it writes one line per

-   frame. Default none

+   the file if it doesnt already exist. If :option:`--csv-log-level` is 0, 

+   it adds one line per run. If :option:`--csv-log-level` is greater than

+   0, it writes one line per frame. Default none

    When frame level logging is enabled, several frame performance

    statistics are listed:

@@ -123,13 +123,17 @@

    enough ahead for the necessary reference data to be available. This

    is more of a problem for P frames where some blocks are much more

    expensive than others.

+   

+   **CLI ONLY**

+.. option:: --csv-log-level <integer>

-.. option:: --cu-stats, --no-cu-stats

+        CSV logging level. Default 0

+        0. summary

+        1. frame level logging

+        2. frame level logging with performance statistics

-   Records statistics on how each CU was coded (split depths and other

-   mode decisions) and reports those statistics at the end of the

-   encode. Default disabled

+        **CLI ONLY**

 .. option:: --ssim, --no-ssim

@@ -349,6 +353,13 @@

    **CLI ONLY**

+.. option:: --total-frames <integer>

+

+   The number of frames intended to be encoded.  It may be left

+   unspecified, but when it is specified rate control can make use of

+   this information. It is also used to determine if an encode is

+   actually a stillpicture profile encode (single frame)

+

 .. option:: --dither

    Enable high quality downscaling. Dithering is based on the diffusion

@@ -384,7 +395,7 @@

    **Range of values:** positive int or float, or num/denom

-.. option:: --interlaceMode <false|tff|bff>, --no-interlaceMode

+.. option:: --interlace <false|tff|bff>, --no-interlace

    0. progressive pictures **(default)**

    1. top field first 

@@ -419,14 +430,18 @@

    **CLI ONLY**

-.. option:: --output-depth, -D 8|10

+.. option:: --output-depth, -D 8|10|12

    Bitdepth of output HEVC bitstream, which is also the internal bit

    depth of the encoder. If the requested bit depth is not the bit

    depth of the linked libx265, it will attempt to bind libx265_main

-   for an 8bit encoder, or libx265_main10 for a 10bit encoder, with the

+   for an 8bit encoder, libx265_main10 for a 10bit encoder, or

+   libx265_main12 for a 12bit encoder (EXPERIMENTAL), with the

    same API version as the linked libx265.

+   If the output depth is not specified but :option:`--profile` is

+   specified, the output depth will be derived from the profile name.

+

    **CLI ONLY**

 Profile, Level, Tier

@@ -439,15 +454,44 @@

    profile.  May abort the encode if the specified profile is

    impossible to be supported by the compile options chosen for the

    encoder (a high bit depth encoder will be unable to output

-   bitstreams compliant with Main or Mainstillpicture).

+   bitstreams compliant with Main or MainStillPicture).

+

+   The following profiles are supported in x265.

+

+   8bit profiles::

+

+   main, main-intra, mainstillpicture (or msp for short)

+   main444-8 main444-intra main444-stillpicture

+   See note below on signaling intra and stillpicture profiles.

+   

+   10bit profiles::

+

+   main10, main10-intra

+   main422-10, main422-10-intra

+   main444-10, main444-10-intra

+

+   12bit profiles::

+

+   main12, main12-intra

+   main422-12, main422-12-intra

+   main444-12, main444-12-intra

+

+

+   **CLI ONLY**

-   API users must use x265_param_apply_profile() after configuring

+   API users must call x265_param_apply_profile() after configuring

    their param structure. Any changes made to the param structure after

    this call might make the encode non-compliant.

-   **Values:** main, main10, mainstillpicture, main422-8, main422-10, main444-8, main444-10

+   The CLI application will derive the output bit depth from the

+   profile name if :option:`--output-depth` is not specified.

-   **CLI ONLY**

+.. note::

+

+   All 12bit presets are extremely unstable, do not use them yet.

+   16bit is not supported at all, but those profiles are included

+   because it is possible for libx265 to make bitstreams compatible

+   with them.

 .. option:: --level-idc <integer|float>

@@ -479,6 +523,9 @@

    specified level, main tier first, turning on high tier only if 

    necessary and available at that level.

+   If :option:`--level-idc` has not been specified, this argument is

+   ignored.

+

 .. option:: --ref <1..16>

    Max number of L0 references to be allowed. This number has a linear

@@ -511,6 +558,7 @@

    Default: disabled

 .. note::

+

    :option:`--profile`, :option:`--level-idc`, and

    :option:`--high-tier` are only intended for use when you are

    targeting a particular decoder (or decoders) with fixed resource

@@ -519,6 +567,29 @@

    parameters to meet those requirements but it will never raise

    them. It may enable VBV constraints on a CRF encode.

+   Also note that x265 determines the decoder requirement profile and

+   level in three steps.  First, the user configures an x265_param

+   structure with their suggested encoder options and then optionally

+   calls x265_param_apply_profile() to enforce a specific profile

+   (main, main10, etc). Second, an encoder is created from this

+   x265_param instance and the :option:`--level-idc` and

+   :option:`--high-tier` parameters are used to reduce bitrate or other

+   features in order to enforce the target level. Finally, the encoder

+   re-examines the final set of parameters and detects the actual

+   minimum decoder requirement level and this is what is signaled in

+   the bitstream headers. The detected decoder level will only use High

+   tier if the user specified a High tier level.

+

+   The signaled profile will be determined by the encoder's internal

+   bitdepth and input color space. If :option:`--keyint` is 0 or 1,

+   then an intra variant of the profile will be signaled.

+

+   If :option:`--total-frames` is 1, then a stillpicture variant will

+   be signaled, but this parameter is not always set by applications,

+   particularly not when the CLI uses stdin streaming or when libx265

+   is used by third-party applications.

​

@@ -114,12 +114,12 @@

 ~~~~~~~~~~~~~~~~~~~~

 :option:`--tune` *grain* tries to improve the retention of film grain in

-the reconstructed output. It helps rate distortion optimizations select

-modes which preserve high frequency noise:

+the reconstructed output. It disables rate distortion optimizations in

+quantization, and increases the default psy-rd.

     * :option:`--psy-rd` 0.5

-    * :option:`--rdoq-level` 1

-    * :option:`--psy-rdoq` 30

+    * :option:`--rdoq-level` 0

+    * :option:`--psy-rdoq` 0

 It lowers the strength of adaptive quantization, so residual energy can

 be more evenly distributed across the (noisy) picture:

​

@@ -28,7 +28,7 @@

 providers are recommended to call this method when they make new jobs

 available.

-Worker jobs are not allowed to block except when abosultely necessary

+Worker jobs are not allowed to block except when absolutely necessary

 for data locking. If a job becomes blocked, the work function is

 expected to drop that job so the worker thread may go back to the pool

 and find more work.

@@ -94,10 +94,10 @@

 If a worker thread job has work which can be performed in parallel by

 many threads, it may allocate a bonded task group and enlist the help of

-other idle worker threads in the same pool. Those threads will cooperate

-to complete the work of the bonded task group and then return to their

-idle states. The larger and more uniform those tasks are, the better the

-bonded task group will perform.

+other idle worker threads from the same thread pool. Those threads will

+cooperate to complete the work of the bonded task group and then return

+to their idle states. The larger and more uniform those tasks are, the

+better the bonded task group will perform.

 Parallel Mode Analysis

 ~~~~~~~~~~~~~~~~~~~~~~

@@ -105,19 +105,20 @@

 When :option:`--pmode` is enabled, each CU (at all depths from 64x64 to

 8x8) will distribute its analysis work to the thread pool via a bonded

 task group. Each analysis job will measure the cost of one prediction

-for the CU: merge, skip, intra, inter (2Nx2N, Nx2N, 2NxN, and AMP). At

-slower presets, the amount of increased parallelism is often enough to

-be able to reduce frame parallelism while achieving the same overall CPU

-utilization. Reducing frame threads is often beneficial to ABR and VBV

-rate control.

+for the CU: merge, skip, intra, inter (2Nx2N, Nx2N, 2NxN, and AMP).

+

+At slower presets, the amount of increased parallelism from pmode is

+often enough to be able to reduce or disable frame parallelism while

+achieving the same overall CPU utilization. Reducing frame threads is

+often beneficial to ABR and VBV rate control.

 Parallel Motion Estimation

 ~~~~~~~~~~~~~~~~~~~~~~~~~~

 When :option:`--pme` is enabled all of the analysis functions which

 perform motion searches to reference frames will distribute those motion

-searches as jobs for worker threads via a bonded task group (if more

-than two motion searches are required).

+searches to other worker threads via a bonded task group (if more than

+two motion searches are required).

 Frame Threading

 ===============

@@ -241,7 +242,7 @@

 bonded task groups to measure single frame cost estimates using slices.

 (see :option:`--lookahead-slices`)

-The function slicetypeDecide() itself is also be performed by a worker

+The main slicetypeDecide() function itself is also performed by a worker

 thread if your encoder has a thread pool, else it runs within the

 context of the thread which calls the x265_encoder_encode().

​

@@ -30,7 +30,7 @@

 mark_as_advanced(FPROFILE_USE FPROFILE_GENERATE NATIVE_BUILD)

 # X265_BUILD must be incremented each time the public API is changed

-set(X265_BUILD 59)

+set(X265_BUILD 68)

 configure_file("${PROJECT_SOURCE_DIR}/x265.def.in"

                "${PROJECT_BINARY_DIR}/x265.def")

 configure_file("${PROJECT_SOURCE_DIR}/x265_config.h.in"

@@ -42,6 +42,8 @@

 string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" SYSPROC)

 set(X86_ALIASES x86 i386 i686 x86_64 amd64)

 list(FIND X86_ALIASES "${SYSPROC}" X86MATCH)

+set(POWER_ALIASES ppc64 ppc64le)

+list(FIND POWER_ALIASES "${SYSPROC}" POWERMATCH)

 if("${SYSPROC}" STREQUAL "" OR X86MATCH GREATER "-1")

     message(STATUS "Detected x86 target processor")

     set(X86 1)

@@ -50,6 +52,10 @@

         set(X64 1)

         add_definitions(-DX86_64=1)

     endif()

+elseif(POWERMATCH GREATER "-1")

+    message(STATUS "Detected POWER target processor")

+    set(POWER 1)

+    add_definitions(-DX265_ARCH_POWER=1)

 elseif(${SYSPROC} STREQUAL "armv6l")

     message(STATUS "Detected ARM target processor")

     set(ARM 1)

@@ -82,6 +88,10 @@

         endif()

     endif()

     mark_as_advanced(LIBRT NUMA_FOUND)

+    option(NO_ATOMICS "Use a slow mutex to replace atomics" OFF)

+    if(NO_ATOMICS)

+        add_definitions(-DNO_ATOMICS=1)

+    endif(NO_ATOMICS)

 endif(UNIX)

 if(X64 AND NOT WIN32)

@@ -260,6 +270,8 @@

         message(STATUS "Found Yasm ${YASM_VERSION_STRING} to build assembly primitives")

         option(ENABLE_ASSEMBLY "Enable use of assembly coded primitives" ON)

     endif()

+else()

+    option(ENABLE_ASSEMBLY "Enable use of assembly coded primitives" OFF)

 endif()

 option(CHECKED_BUILD "Enable run-time sanity checks (debugging)" OFF)

@@ -270,23 +282,59 @@

 # Build options

 set(LIB_INSTALL_DIR lib CACHE STRING "Install location of libraries")

 set(BIN_INSTALL_DIR bin CACHE STRING "Install location of executables")

+set(EXTRA_LIB "" CACHE STRING "Extra libraries to link against")

+set(EXTRA_LINK_FLAGS "" CACHE STRING "Extra link flags")

+if(EXTRA_LINK_FLAGS)

+    list(APPEND LINKER_OPTIONS ${EXTRA_LINK_FLAGS})

+endif()

+if(EXTRA_LIB)

+    option(LINKED_8BIT  "8bit libx265 is being linked with this library" OFF)

+    option(LINKED_10BIT "10bit libx265 is being linked with this library" OFF)

+    option(LINKED_12BIT "12bit libx265 is being linked with this library" OFF)

+endif(EXTRA_LIB)

+mark_as_advanced(EXTRA_LIB EXTRA_LINK_FLAGS)

 if(X64)

-    # NOTE: We only officially support 16bit-per-pixel compiles of x265

-    # on 64bit architectures. 16bpp plus large resolution plus slow

+    # NOTE: We only officially support high-bit-depth compiles of x265

+    # on 64bit architectures. Main10 plus large resolution plus slow

     # preset plus 32bit address space usually means malloc failure.  You

     # can disable this if(X64) check if you desparately need a 32bit

     # build with 10bit/12bit support, but this violates the "shrink wrap

     # license" so to speak.  If it breaks you get to keep both halves.

-    # You will likely need to compile without assembly

-    option(HIGH_BIT_DEPTH "Store pixels as 16bit values" OFF)

+    # You will need to disable assembly manually.

+    option(HIGH_BIT_DEPTH "Store pixel samples as 16bit values (Main10/Main12)" OFF)

 endif(X64)

 if(HIGH_BIT_DEPTH)

-    add_definitions(-DHIGH_BIT_DEPTH=1)

+    option(MAIN12 "Support Main12 instead of Main10" OFF)

+    if(MAIN12)

+        add_definitions(-DHIGH_BIT_DEPTH=1 -DX265_DEPTH=12)

+    else()

+        add_definitions(-DHIGH_BIT_DEPTH=1 -DX265_DEPTH=10)

+    endif()

 else(HIGH_BIT_DEPTH)

-    add_definitions(-DHIGH_BIT_DEPTH=0)

+    add_definitions(-DHIGH_BIT_DEPTH=0 -DX265_DEPTH=8)

 endif(HIGH_BIT_DEPTH)

+# this option can only be used when linking multiple libx265 libraries

+# together, and some alternate API access method is implemented.

+option(EXPORT_C_API "Implement public C programming interface" ON)

+mark_as_advanced(EXPORT_C_API)

+if(EXPORT_C_API)

+    set(X265_NS x265)

+    add_definitions(-DEXPORT_C_API=1)

+elseif(HIGH_BIT_DEPTH)

+    if(MAIN12)

+        set(X265_NS x265_12bit)

+    else()

+        set(X265_NS x265_10bit)

+    endif()

+    add_definitions(-DEXPORT_C_API=0)

+else()

+    set(X265_NS x265_8bit)

+    add_definitions(-DEXPORT_C_API=0)

+endif()

+add_definitions(-DX265_NS=${X265_NS})

+

 option(WARNINGS_AS_ERRORS "Stop compiles on first warning" OFF)

 if(WARNINGS_AS_ERRORS)

     if(GCC)

@@ -375,6 +423,9 @@

 if(NOT MSVC)

     set_target_properties(x265-static PROPERTIES OUTPUT_NAME x265)

 endif()

+if(EXTRA_LIB)

+    target_link_libraries(x265-static ${EXTRA_LIB})

+endif()

 install(TARGETS x265-static

     LIBRARY DESTINATION ${LIB_INSTALL_DIR}

     ARCHIVE DESTINATION ${LIB_INSTALL_DIR})

@@ -415,7 +466,7 @@

         if(APPLE)

             set_target_properties(x265-shared PROPERTIES MACOSX_RPATH 1)

         else()

-            set_target_properties(x265-shared PROPERTIES LINK_FLAGS "-Wl,-Bsymbolic,-znoexecstack")

+            list(APPEND LINKER_OPTIONS "-Wl,-Bsymbolic,-znoexecstack")

         endif()

     endif()

     set_target_properties(x265-shared PROPERTIES SOVERSION ${X265_BUILD})

@@ -429,6 +480,9 @@

                 ARCHIVE DESTINATION ${LIB_INSTALL_DIR}

                 RUNTIME DESTINATION ${BIN_INSTALL_DIR})

     endif()

+    if(EXTRA_LIB)

+        target_link_libraries(x265-shared ${EXTRA_LIB})

+    endif()

     if(LINKER_OPTIONS)

         # set_target_properties can't do list expansion

         string(REPLACE ";" " " LINKER_OPTION_STR "${LINKER_OPTIONS}")

@@ -468,16 +522,14 @@

 endif()

 # Main CLI application

-option(ENABLE_CLI "Build standalone CLI application" ON)

+set(ENABLE_CLI ON CACHE BOOL "Build standalone CLI application")

 if(ENABLE_CLI)

     file(GLOB InputFiles input/input.cpp input/yuv.cpp input/y4m.cpp input/*.h)

     file(GLOB OutputFiles output/output.cpp output/reconplay.cpp output/*.h

                           output/yuv.cpp output/y4m.cpp # recon

                           output/raw.cpp)               # muxers

-    file(GLOB FilterFiles filters/*.cpp filters/*.h)

     source_group(input FILES ${InputFiles})

     source_group(output FILES ${OutputFiles})

-    source_group(filters FILES ${FilterFiles})

     check_include_files(getopt.h HAVE_GETOPT_H)

     if(NOT HAVE_GETOPT_H)

@@ -487,13 +539,18 @@

         include_directories(compat/getopt)

         set(GETOPT compat/getopt/getopt.c compat/getopt/getopt.h)

     endif(NOT HAVE_GETOPT_H)

+    if(WIN32)

+        set(ExportDefs "${PROJECT_BINARY_DIR}/x265.def")

+    endif(WIN32)

     if(XCODE)

         # Xcode seems unable to link the CLI with libs, so link as one targget

-        add_executable(cli ../COPYING ${InputFiles} ${OutputFiles} ${FilterFiles} ${GETOPT} x265.cpp x265.h x265cli.h

-                           $<TARGET_OBJECTS:encoder> $<TARGET_OBJECTS:common> ${YASM_OBJS} ${YASM_SRCS})

+        add_executable(cli ../COPYING ${InputFiles} ${OutputFiles} ${GETOPT}

+                       x265.cpp x265.h x265cli.h x265-extras.h x265-extras.cpp

+                       $<TARGET_OBJECTS:encoder> $<TARGET_OBJECTS:common> ${YASM_OBJS} ${YASM_SRCS})

     else()