Skip to content

Commit

Permalink
update openh264 version (#3565)
Browse files Browse the repository at this point in the history
  • Loading branch information
GuangweiWang authored Sep 13, 2022
1 parent 2e63786 commit 05682d2
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 15 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ STATIC_LDFLAGS=-lstdc++
STRIP ?= strip
USE_STACK_PROTECTOR = Yes

SHAREDLIB_MAJORVERSION=6
FULL_VERSION := 2.3.0
SHAREDLIB_MAJORVERSION=7
FULL_VERSION := 2.3.1

ifeq (,$(wildcard $(SRC_PATH)gmp-api))
HAVE_GMP_API=No
Expand Down
4 changes: 2 additions & 2 deletions build/platform-darwin.mk
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ SHAREDLIB_DIR = $(PREFIX)/lib
SHAREDLIBSUFFIX = dylib
SHAREDLIBSUFFIXFULLVER=$(FULL_VERSION).$(SHAREDLIBSUFFIX)
SHAREDLIBSUFFIXMAJORVER=$(SHAREDLIB_MAJORVERSION).$(SHAREDLIBSUFFIX)
CURRENT_VERSION := 2.3.0
COMPATIBILITY_VERSION := 2.3.0
CURRENT_VERSION := 2.3.1
COMPATIBILITY_VERSION := 2.3.1
SHLDFLAGS = -dynamiclib -twolevel_namespace -undefined dynamic_lookup \
-fno-common -headerpad_max_install_names -install_name \
$(SHAREDLIB_DIR)/$(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIXMAJORVER)
Expand Down
8 changes: 4 additions & 4 deletions codec/api/wels/codec_ver.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@

#include "codec_app_def.h"

static const OpenH264Version g_stCodecVersion = {2, 3, 0, 2206};
static const char* const g_strCodecVer = "OpenH264 version:2.3.0.2206";
static const OpenH264Version g_stCodecVersion = {2, 3, 1, 2209};
static const char* const g_strCodecVer = "OpenH264 version:2.3.1.2209";

#define OPENH264_MAJOR (2)
#define OPENH264_MINOR (3)
#define OPENH264_REVISION (0)
#define OPENH264_RESERVED (2206)
#define OPENH264_REVISION (1)
#define OPENH264_RESERVED (2209)

#endif // CODEC_VER_H
2 changes: 1 addition & 1 deletion gmpopenh264.info
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Name: gmpopenh264
Description: GMP Plugin for OpenH264.
Version: 2.3.0
Version: 2.3.1
APIs: encode-video[h264], decode-video[h264]
4 changes: 2 additions & 2 deletions meson.build
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
project('openh264', ['c', 'cpp'],
version : '2.3.0',
version : '2.3.1',
meson_version : '>= 0.52',
default_options : [ 'warning_level=1',
'buildtype=debugoptimized' ])

major_version = '6'
major_version = '7'

cpp = meson.get_compiler('cpp')

Expand Down
8 changes: 4 additions & 4 deletions openh264.rc
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//

VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,3,0,2206
PRODUCTVERSION 2,3,0,2206
FILEVERSION 2,3,1,2209
PRODUCTVERSION 2,3,1,2209
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
Expand All @@ -43,12 +43,12 @@ BEGIN
VALUE "Comments", "Cisco OpenH264 codec"
VALUE "CompanyName", "Cisco Systems Inc."
VALUE "FileDescription", "Cisco OpenH264 codec"
VALUE "FileVersion", "2.3.0.2206"
VALUE "FileVersion", "2.3.1.2209"
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.3.0.2206"
VALUE "ProductVersion", "2.3.1.2209"
END
END
BLOCK "VarFileInfo"
Expand Down

0 comments on commit 05682d2

Please sign in to comment.