From a9f2a6d5d739b7789db79112bd2b13fdb7dcae70 Mon Sep 17 00:00:00 2001 From: "wme-jenkins.gen" Date: Thu, 9 May 2019 02:13:25 +0800 Subject: [PATCH] update version to 2.0.0 --- Makefile | 2 +- build/platform-darwin.mk | 4 ++-- codec/api/svc/codec_ver.h | 10 +++++----- gmpopenh264.info | 2 +- openh264.rc | 8 ++++---- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index e70c966d34..74ff029d90 100644 --- a/Makefile +++ b/Makefile @@ -36,7 +36,7 @@ STATIC_LDFLAGS=-lstdc++ STRIP ?= strip SHAREDLIB_MAJORVERSION=5 -FULL_VERSION := 1.9.0 +FULL_VERSION := 2.0.0 ifeq (,$(wildcard $(SRC_PATH)gmp-api)) HAVE_GMP_API=No diff --git a/build/platform-darwin.mk b/build/platform-darwin.mk index abb60d478d..6c7b244343 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 := 1.9.0 -COMPATIBILITY_VERSION := 1.9.0 +CURRENT_VERSION := 2.0.0 +COMPATIBILITY_VERSION := 2.0.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 1c366f139d..06d5efcd22 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 = {1, 9, 0, 1806}; -static const char* const g_strCodecVer = "OpenH264 version:1.9.0.1806"; +static const OpenH264Version g_stCodecVersion = {2, 0, 0, 1905}; +static const char* const g_strCodecVer = "OpenH264 version:2.0.0.1905"; -#define OPENH264_MAJOR (1) -#define OPENH264_MINOR (9) +#define OPENH264_MAJOR (2) +#define OPENH264_MINOR (0) #define OPENH264_REVISION (0) -#define OPENH264_RESERVED (1806) +#define OPENH264_RESERVED (1905) #endif // CODEC_VER_H diff --git a/gmpopenh264.info b/gmpopenh264.info index ad01420f0d..8a791ec4f1 100644 --- a/gmpopenh264.info +++ b/gmpopenh264.info @@ -1,4 +1,4 @@ Name: gmpopenh264 Description: GMP Plugin for OpenH264. -Version: 1.8.0 +Version: 2.0.0 APIs: encode-video[h264], decode-video[h264] diff --git a/openh264.rc b/openh264.rc index d06a147066..a0163fbe18 100644 --- a/openh264.rc +++ b/openh264.rc @@ -24,8 +24,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,9,0,1806 - PRODUCTVERSION 1,9,0,1806 + FILEVERSION 2,0,0,1905 + PRODUCTVERSION 2,0,0,1905 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", "1.9.0.1806" + VALUE "FileVersion", "2.0.0.1905" 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", "1.9.0.1806" + VALUE "ProductVersion", "2.0.0.1905" END END BLOCK "VarFileInfo"