Merge pull request #3281 from GuangweiWang/public-release-update-vers…

…ion-2.1.1 update version to 2.1.1
cisco · May 8, 2020 · d13f170 · d13f170
2 parents b0a72fd + a9f5ec7
commit d13f170
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/Makefile b/Makefile
@@ -36,7 +36,7 @@ STATIC_LDFLAGS=-lstdc++
 STRIP ?= strip
 
 SHAREDLIB_MAJORVERSION=6
-FULL_VERSION := 2.1.0
+FULL_VERSION := 2.1.1
 
 ifeq (,$(wildcard $(SRC_PATH)gmp-api))
 HAVE_GMP_API=No

diff --git a/build/platform-darwin.mk b/build/platform-darwin.mk
@@ -3,7 +3,7 @@ SHAREDLIB_DIR = $(PREFIX)/lib
 SHAREDLIBSUFFIX = dylib
 SHAREDLIBSUFFIXFULLVER=$(FULL_VERSION).$(SHAREDLIBSUFFIX)
 SHAREDLIBSUFFIXMAJORVER=$(SHAREDLIB_MAJORVERSION).$(SHAREDLIBSUFFIX)
-CURRENT_VERSION := 2.1.0
+CURRENT_VERSION := 2.1.1
 COMPATIBILITY_VERSION := 2.1.0
 SHLDFLAGS = -dynamiclib -twolevel_namespace -undefined dynamic_lookup \
 	-fno-common -headerpad_max_install_names -install_name \

diff --git 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, 0, 2002};
-static const char* const g_strCodecVer  = "OpenH264 version:2.1.0.2002";
+static const OpenH264Version g_stCodecVersion  = {2, 1, 1, 2005};
+static const char* const g_strCodecVer  = "OpenH264 version:2.1.1.2005";
 
 #define OPENH264_MAJOR (2)
 #define OPENH264_MINOR (1)
-#define OPENH264_REVISION (0)
-#define OPENH264_RESERVED (2002)
+#define OPENH264_REVISION (1)
+#define OPENH264_RESERVED (2005)
 
 #endif  // CODEC_VER_H
diff --git a/gmpopenh264.info b/gmpopenh264.info
@@ -1,4 +1,4 @@
 Name: gmpopenh264
 Description: GMP Plugin for OpenH264.
-Version: 2.1.0
+Version: 2.1.1
 APIs: encode-video[h264], decode-video[h264]
diff --git a/meson.build b/meson.build
@@ -1,5 +1,5 @@
 project('openh264', ['c', 'cpp'],
-  version : '2.1.0',
+  version : '2.1.1',
   meson_version : '>= 0.47',
   default_options : [ 'warning_level=1',
                       'buildtype=debugoptimized' ])

diff --git a/openh264.rc b/openh264.rc
@@ -24,8 +24,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,1,0,2002
- PRODUCTVERSION 2,1,0,2002
+ FILEVERSION 2,1,1,2005
+ PRODUCTVERSION 2,1,1,2005
  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.0.2002"
+            VALUE "FileVersion", "2.1.1.2005"
             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.0.2002"
+            VALUE "ProductVersion", "2.1.1.2005"
         END
     END
     BLOCK "VarFileInfo"