shithub: openh264

Download patch

ref: a4caef0fa3b700927b005d6d31706476ada84a55
parent: fd2e859382d1f0044a5941f5f4e3a8dc999ff02d
parent: 1cae5749e3a864b05f530405d88c7d9165f607de
author: guangwei <[email protected]>
date: Wed Mar 29 11:08:14 EDT 2017 

Merge pull request #2709 from mstorsjo/update-version

Update the version to 1.7.0 on the master branch as well


--- a/Makefile
+++ b/Makefile
@@ -33,8 +33,8 @@
 CCASFLAGS=$(CFLAGS)
 STATIC_LDFLAGS=-lstdc++
 
-SHAREDLIB_MAJORVERSION=3
-FULL_VERSION := 1.6.0
+SHAREDLIB_MAJORVERSION=4
+FULL_VERSION := 1.7.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.6.0
-COMPATIBILITY_VERSION := 1.6.0
+CURRENT_VERSION := 1.7.0
+COMPATIBILITY_VERSION := 1.7.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, 6, 0, 0};
-static const char* const g_strCodecVer  = "OpenH264 version:1.6.0.0";
+static const OpenH264Version g_stCodecVersion  = {1, 7, 0, 1703};
+static const char* const g_strCodecVer  = "OpenH264 version:1.7.0.1703";
 
 #define OPENH264_MAJOR (1)
-#define OPENH264_MINOR (6)
+#define OPENH264_MINOR (7)
 #define OPENH264_REVISION (0)
-#define OPENH264_RESERVED (0)
+#define OPENH264_RESERVED (1703)
 
 #endif  // CODEC_VER_H
--- a/openh264.rc
+++ b/openh264.rc
@@ -24,8 +24,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,6,0,0
- PRODUCTVERSION 1,6,0,0
+ FILEVERSION 1,7,0,1703
+ PRODUCTVERSION 1,7,0,1703
  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.6.0.0"
+            VALUE "FileVersion", "1.7.0.1703"
             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.6.0.0"
+            VALUE "ProductVersion", "1.7.0.1703"
         END
     END
     BLOCK "VarFileInfo"