ref: 5b8f7f5c71a75748ec6a528f615bb9114c461b5d
parent: 25bf3b0f7263762029a6454132238bfa0025c682
parent: 29f7dbe180a409a47d23edc41d1ca5d57c027f39
author: sijchen <[email protected]>
date: Mon Jul 30 14:53:09 EDT 2018
Merge pull request #3003 from mstorsjo/version-bump Bump API version to 1.9
--- a/Makefile
+++ b/Makefile
@@ -34,8 +34,8 @@
STATIC_LDFLAGS=-lstdc++
STRIP ?= strip
-SHAREDLIB_MAJORVERSION=4
-FULL_VERSION := 1.8.0
+SHAREDLIB_MAJORVERSION=5
+FULL_VERSION := 1.9.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.8.0
-COMPATIBILITY_VERSION := 1.8.0
+CURRENT_VERSION := 1.9.0
+COMPATIBILITY_VERSION := 1.9.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,11 +4,11 @@
#include "codec_app_def.h"
-static const OpenH264Version g_stCodecVersion = {1, 8, 0, 1806};
-static const char* const g_strCodecVer = "OpenH264 version:1.8.0.1806";
+static const OpenH264Version g_stCodecVersion = {1, 9, 0, 1806};
+static const char* const g_strCodecVer = "OpenH264 version:1.9.0.1806";
#define OPENH264_MAJOR (1)
-#define OPENH264_MINOR (8)
+#define OPENH264_MINOR (9)
#define OPENH264_REVISION (0)
#define OPENH264_RESERVED (1806)
--- a/openh264.rc
+++ b/openh264.rc
@@ -24,8 +24,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,8,0,1806
- PRODUCTVERSION 1,8,0,1806
+ FILEVERSION 1,9,0,1806
+ PRODUCTVERSION 1,9,0,1806
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.8.0.1806"
+ VALUE "FileVersion", "1.9.0.1806"
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.8.0.1806"
+ VALUE "ProductVersion", "1.9.0.1806"
END
END
BLOCK "VarFileInfo"