ref: 1896ed23ad12b652cbd1baa4879428a4630f74f7
parent: 1ddfe902c6fd34f75f91f9fc9b2696f921ca603b
parent: 55118743a81261eb8212811af3d9f0fe8ce90efc
author: guangwei <[email protected]>
date: Wed Feb 26 09:50:58 EST 2020
Merge pull request #3240 from ycqian/public-release-update-version-2.1.0 update version to 2.1.0
--- a/Makefile
+++ b/Makefile
@@ -36,7 +36,7 @@
STRIP ?= strip
SHAREDLIB_MAJORVERSION=5
-FULL_VERSION := 2.0.0
+FULL_VERSION := 2.1.0
ifeq (,$(wildcard $(SRC_PATH)gmp-api))
HAVE_GMP_API=No
--- a/build/platform-darwin.mk
+++ b/build/platform-darwin.mk
@@ -3,8 +3,8 @@
SHAREDLIBSUFFIX = dylib
SHAREDLIBSUFFIXFULLVER=$(FULL_VERSION).$(SHAREDLIBSUFFIX)
SHAREDLIBSUFFIXMAJORVER=$(SHAREDLIB_MAJORVERSION).$(SHAREDLIBSUFFIX)
-CURRENT_VERSION := 2.0.0
-COMPATIBILITY_VERSION := 2.0.0
+CURRENT_VERSION := 2.1.0
+COMPATIBILITY_VERSION := 2.1.0
SHLDFLAGS = -dynamiclib -twolevel_namespace -undefined dynamic_lookup \
-fno-common -headerpad_max_install_names -install_name \
$(SHAREDLIB_DIR)/$(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIXMAJORVER)
--- 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, 0, 0, 1905};
-static const char* const g_strCodecVer = "OpenH264 version:2.0.0.1905";
+static const OpenH264Version g_stCodecVersion = {2, 1, 0, 2002};
+static const char* const g_strCodecVer = "OpenH264 version:2.1.0.2002";
#define OPENH264_MAJOR (2)
-#define OPENH264_MINOR (0)
+#define OPENH264_MINOR (1)
#define OPENH264_REVISION (0)
-#define OPENH264_RESERVED (1905)
+#define OPENH264_RESERVED (2002)
#endif // CODEC_VER_H
--- a/gmpopenh264.info
+++ b/gmpopenh264.info
@@ -1,4 +1,4 @@
Name: gmpopenh264
Description: GMP Plugin for OpenH264.
-Version: 2.0.0
+Version: 2.1.0
APIs: encode-video[h264], decode-video[h264]
--- a/openh264.rc
+++ b/openh264.rc
@@ -24,8 +24,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,0,0,1905
- PRODUCTVERSION 2,0,0,1905
+ FILEVERSION 2,1,0,2002
+ PRODUCTVERSION 2,1,0,2002
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -43,12 +43,12 @@
VALUE "Comments", "Cisco OpenH264 codec"
VALUE "CompanyName", "Cisco Systems Inc."
VALUE "FileDescription", "Cisco OpenH264 codec"
- VALUE "FileVersion", "2.0.0.1905"
+ VALUE "FileVersion", "2.1.0.2002"
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.0.0.1905"
+ VALUE "ProductVersion", "2.1.0.2002"
END
END
BLOCK "VarFileInfo"