From 2c4379535ca62afafd39ca232f2e3592895b1fd7 Mon Sep 17 00:00:00 2001 From: guangwei Date: Tue, 25 Jan 2022 13:33:38 +0800 Subject: [PATCH] update version to 2.2.0 (#3472) --- Makefile | 2 +- build/platform-darwin.mk | 4 ++-- codec/api/svc/codec_ver.h | 8 ++++---- gmpopenh264.info | 2 +- meson.build | 2 +- openh264.rc | 8 ++++---- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index 8fb3267ca9..ae5c6ecdfb 100644 --- a/Makefile +++ b/Makefile @@ -37,7 +37,7 @@ STRIP ?= strip USE_STACK_PROTECTOR = Yes SHAREDLIB_MAJORVERSION=6 -FULL_VERSION := 2.1.1 +FULL_VERSION := 2.2.0 ifeq (,$(wildcard $(SRC_PATH)gmp-api)) HAVE_GMP_API=No diff --git a/build/platform-darwin.mk b/build/platform-darwin.mk index caf58aa09b..0f2fd43ae5 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.1.1 -COMPATIBILITY_VERSION := 2.1.0 +CURRENT_VERSION := 2.2.0 +COMPATIBILITY_VERSION := 2.2.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/svc/codec_ver.h b/codec/api/svc/codec_ver.h index 045a1c2283..adc1c3e91c 100644 --- a/codec/api/svc/codec_ver.h +++ b/codec/api/svc/codec_ver.h @@ -4,12 +4,12 @@ #include "codec_app_def.h" -static const OpenH264Version g_stCodecVersion = {2, 1, 1, 2201}; -static const char* const g_strCodecVer = "OpenH264 version:2.1.1.2201"; +static const OpenH264Version g_stCodecVersion = {2, 2, 0, 2201}; +static const char* const g_strCodecVer = "OpenH264 version:2.2.0.2201"; #define OPENH264_MAJOR (2) -#define OPENH264_MINOR (1) -#define OPENH264_REVISION (1) +#define OPENH264_MINOR (2) +#define OPENH264_REVISION (0) #define OPENH264_RESERVED (2201) #endif // CODEC_VER_H diff --git a/gmpopenh264.info b/gmpopenh264.info index 2195900c85..3d968cbb19 100644 --- a/gmpopenh264.info +++ b/gmpopenh264.info @@ -1,4 +1,4 @@ Name: gmpopenh264 Description: GMP Plugin for OpenH264. -Version: 2.1.1 +Version: 2.2.0 APIs: encode-video[h264], decode-video[h264] diff --git a/meson.build b/meson.build index f922e11f51..424c78a19c 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('openh264', ['c', 'cpp'], - version : '2.1.1', + version : '2.2.0', meson_version : '>= 0.52', default_options : [ 'warning_level=1', 'buildtype=debugoptimized' ]) diff --git a/openh264.rc b/openh264.rc index 21b345f1c9..5b45858508 100644 --- a/openh264.rc +++ b/openh264.rc @@ -24,8 +24,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,1,1,2201 - PRODUCTVERSION 2,1,1,2201 + FILEVERSION 2,2,0,2201 + PRODUCTVERSION 2,2,0,2201 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.1.1.2201" + VALUE "FileVersion", "2.2.0.2201" 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.1.1.2201" + VALUE "ProductVersion", "2.2.0.2201" END END BLOCK "VarFileInfo"