diff --git a/Makefile b/Makefile index ce80e23c6..290d4b272 100644 --- a/Makefile +++ b/Makefile @@ -38,8 +38,8 @@ USE_STACK_PROTECTOR = Yes USE_LOW_VERSION_NDK=No USE_ANT=No -SHAREDLIB_MAJORVERSION=7 -FULL_VERSION := 2.5.0 +SHAREDLIB_MAJORVERSION=8 +FULL_VERSION := 2.6.0 ifeq (,$(wildcard $(SRC_PATH)gmp-api)) HAVE_GMP_API=No diff --git a/build/platform-darwin.mk b/build/platform-darwin.mk index da5574a6e..c941b3103 100644 --- a/build/platform-darwin.mk +++ b/build/platform-darwin.mk @@ -3,8 +3,8 @@ SHAREDLIB_DIR = $(PREFIX)/lib SHAREDLIBSUFFIX = dylib SHAREDLIBSUFFIXFULLVER=$(FULL_VERSION).$(SHAREDLIBSUFFIX) SHAREDLIBSUFFIXMAJORVER=$(SHAREDLIB_MAJORVERSION).$(SHAREDLIBSUFFIX) -CURRENT_VERSION := 2.5.0 -COMPATIBILITY_VERSION := 2.5.0 +CURRENT_VERSION := 2.6.0 +COMPATIBILITY_VERSION := 2.6.0 SHLDFLAGS = -dynamiclib -twolevel_namespace -undefined dynamic_lookup \ -fno-common -headerpad_max_install_names -install_name \ $(SHAREDLIB_DIR)/$(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIXMAJORVER) diff --git a/codec/api/wels/codec_ver.h b/codec/api/wels/codec_ver.h index 06b1fc0b0..11a39291b 100644 --- a/codec/api/wels/codec_ver.h +++ b/codec/api/wels/codec_ver.h @@ -4,12 +4,12 @@ #include "codec_app_def.h" -static const OpenH264Version g_stCodecVersion = {2, 5, 0, 2411}; -static const char* const g_strCodecVer = "OpenH264 version:2.5.0.2411"; +static const OpenH264Version g_stCodecVersion = {2, 6, 0, 2502}; +static const char* const g_strCodecVer = "OpenH264 version:2.6.0.2502"; #define OPENH264_MAJOR (2) -#define OPENH264_MINOR (5) +#define OPENH264_MINOR (6) #define OPENH264_REVISION (0) -#define OPENH264_RESERVED (2411) +#define OPENH264_RESERVED (2502) #endif // CODEC_VER_H diff --git a/gmpopenh264.info b/gmpopenh264.info index e7aaeab89..3dabbf3b8 100644 --- a/gmpopenh264.info +++ b/gmpopenh264.info @@ -1,4 +1,4 @@ Name: gmpopenh264 Description: GMP Plugin for OpenH264. -Version: 2.5.0 +Version: 2.6.0 APIs: encode-video[h264], decode-video[h264] diff --git a/meson.build b/meson.build index e8d8f1d2c..6e8b58542 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('openh264', ['c', 'cpp'], - version : '2.5.0', + version : '2.6.0', meson_version : '>= 0.52', default_options : [ 'warning_level=1', 'buildtype=debugoptimized' ]) diff --git a/openh264.rc b/openh264.rc index ecff21410..a36bb527b 100644 --- a/openh264.rc +++ b/openh264.rc @@ -24,8 +24,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,5,0,2411 - PRODUCTVERSION 2,5,0,2411 + FILEVERSION 2,6,0,2502 + PRODUCTVERSION 2,6,0,2502 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -43,12 +43,12 @@ BEGIN VALUE "Comments", "Cisco OpenH264 codec" VALUE "CompanyName", "Cisco Systems Inc." VALUE "FileDescription", "Cisco OpenH264 codec" - VALUE "FileVersion", "2.5.0.2411" + VALUE "FileVersion", "2.6.0.2502" VALUE "InternalName", "openh264.dll" VALUE "LegalCopyright", "© 2011-2015 Cisco and/or its affiliates. All rights reserved." VALUE "OriginalFilename", "openh264.dll" VALUE "ProductName", "Cisco OpenH264 codec" - VALUE "ProductVersion", "2.5.0.2411" + VALUE "ProductVersion", "2.6.0.2502" END END BLOCK "VarFileInfo"