ref: 73c535858576f7c47775c45449c15145629c265b
parent: b73c43e87ae9d1c5be1dd24cc83ec49ac0d875a0
parent: 598db3d2c255d36a1cf8ac221f4a9cb9213e8181
author: huili2 <huili2@cisco.com>
date: Wed May 8 11:07:17 EDT 2019
Merge pull request #3132 from aiszhang/public-release-update-version-2.0.0 update version to 2.0.0
--- a/Makefile
+++ b/Makefile
@@ -36,7 +36,7 @@
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
--- 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 := 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)
--- 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
--- 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]
--- a/openh264.rc
+++ b/openh264.rc
@@ -24,8 +24,8 @@
//
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 @@
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"