diff --git a/CMakeLists.txt b/CMakeLists.txt index 1c575aa11..70a126b2b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,7 +13,7 @@ endif() project( vvenc VERSION 1.4.0 ) # set alternative version numbering for release candidates -set( PROJECT_VERSION_RC rc1 ) +#set( PROJECT_VERSION_RC rc1 ) if( PROJECT_VERSION_RC ) set( PROJECT_VERSION "${PROJECT_VERSION}-rc${PROJECT_VERSION_RC}" ) endif() diff --git a/LICENSE.txt b/LICENSE.txt index 517f70214..b4a0a4404 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -46,7 +46,7 @@ notices of its source files. The VVC Test Model (VTM) reference software is lice the following 3-Clause BSD License: /* ----------------------------------------------------------------------------- -The copyright in this software is being made available under the Clear BSD +The copyright in this software is being made available under the BSD License, included below. This software may be subject to other third party and contributor rights, including patent rights, and no such rights are granted under this license. diff --git a/changelog.txt b/changelog.txt index b61eb08ab..ffdd83b4e 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,5 +1,5 @@ ///////////////////////////////////////// -tag 1.4.0 (rc1) +tag 1.4.0 * all: - changed license to the standard Clear BSD license (without adaptations) diff --git a/source/Lib/vvenc/vvencCfg.cpp b/source/Lib/vvenc/vvencCfg.cpp index 53dd0380d..cd065caae 100644 --- a/source/Lib/vvenc/vvencCfg.cpp +++ b/source/Lib/vvenc/vvencCfg.cpp @@ -1306,6 +1306,7 @@ VVENC_DECL bool vvenc_init_config_parameter( vvenc_config *c ) c->m_adpOption = 0; c->m_initialCW = 0; c->m_LMCSOffset = 0; + c->m_useAMaxBT = 0; vvenc_ReshapeCW_default( &c->m_reshapeCW ); }