Skip to content

Commit

Permalink
update openh264 version to v2.5.0 (cisco#3796)
Browse files Browse the repository at this point in the history
  • Loading branch information
BenzhengZhang authored Nov 5, 2024
1 parent f70c905 commit 6432372
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ USE_LOW_VERSION_NDK=No
USE_ANT=No

SHAREDLIB_MAJORVERSION=7
FULL_VERSION := 2.4.1
FULL_VERSION := 2.5.0

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.4.1
COMPATIBILITY_VERSION := 2.4.0
CURRENT_VERSION := 2.5.0
COMPATIBILITY_VERSION := 2.5.0
SHLDFLAGS = -dynamiclib -twolevel_namespace -undefined dynamic_lookup \
-fno-common -headerpad_max_install_names -install_name \
$(SHAREDLIB_DIR)/$(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIXMAJORVER)
Expand Down
10 changes: 5 additions & 5 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, 4, 1, 2401};
static const char* const g_strCodecVer = "OpenH264 version:2.4.1.2401";
static const OpenH264Version g_stCodecVersion = {2, 5, 0, 2411};
static const char* const g_strCodecVer = "OpenH264 version:2.5.0.2411";

#define OPENH264_MAJOR (2)
#define OPENH264_MINOR (4)
#define OPENH264_REVISION (1)
#define OPENH264_RESERVED (2401)
#define OPENH264_MINOR (5)
#define OPENH264_REVISION (0)
#define OPENH264_RESERVED (2411)

#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.4.1
Version: 2.5.0
APIs: encode-video[h264], decode-video[h264]
2 changes: 1 addition & 1 deletion meson.build
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
project('openh264', ['c', 'cpp'],
version : '2.4.1',
version : '2.5.0',
meson_version : '>= 0.52',
default_options : [ 'warning_level=1',
'buildtype=debugoptimized' ])
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,4,1,2401
PRODUCTVERSION 2,4,1,2401
FILEVERSION 2,5,0,2411
PRODUCTVERSION 2,5,0,2411
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.4.1.2401"
VALUE "FileVersion", "2.5.0.2411"
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.4.1.2401"
VALUE "ProductVersion", "2.5.0.2411"
END
END
BLOCK "VarFileInfo"
Expand Down

0 comments on commit 6432372

Please sign in to comment.