Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update openh264 version to v2.4.1 #3724

Merged
merged 1 commit into from
Jan 29, 2024
Merged

update openh264 version to v2.4.1 #3724

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
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.0
FULL_VERSION := 2.4.1

ifeq (,$(wildcard $(SRC_PATH)gmp-api))
HAVE_GMP_API=No
Expand Down
2 changes: 1 addition & 1 deletion build/platform-darwin.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ SHAREDLIB_DIR = $(PREFIX)/lib
SHAREDLIBSUFFIX = dylib
SHAREDLIBSUFFIXFULLVER=$(FULL_VERSION).$(SHAREDLIBSUFFIX)
SHAREDLIBSUFFIXMAJORVER=$(SHAREDLIB_MAJORVERSION).$(SHAREDLIBSUFFIX)
CURRENT_VERSION := 2.4.0
CURRENT_VERSION := 2.4.1
COMPATIBILITY_VERSION := 2.4.0
SHLDFLAGS = -dynamiclib -twolevel_namespace -undefined dynamic_lookup \
-fno-common -headerpad_max_install_names -install_name \
Expand Down
8 changes: 4 additions & 4 deletions codec/api/wels/codec_ver.h
View file
Open in desktop
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, 0, 2310};
static const char* const g_strCodecVer = "OpenH264 version:2.4.0.2310";
static const OpenH264Version g_stCodecVersion = {2, 4, 1, 2401};
static const char* const g_strCodecVer = "OpenH264 version:2.4.1.2401";

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

#endif // CODEC_VER_H
2 changes: 1 addition & 1 deletion gmpopenh264.info
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Name: gmpopenh264
Description: GMP Plugin for OpenH264.
Version: 2.4.0
Version: 2.4.1
APIs: encode-video[h264], decode-video[h264]
2 changes: 1 addition & 1 deletion meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
project('openh264', ['c', 'cpp'],
version : '2.4.0',
version : '2.4.1',
meson_version : '>= 0.52',
default_options : [ 'warning_level=1',
'buildtype=debugoptimized' ])
Expand Down
8 changes: 4 additions & 4 deletions openh264.rc
View file
Open in desktop
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,0,2310
PRODUCTVERSION 2,4,0,2310
FILEVERSION 2,4,1,2401
PRODUCTVERSION 2,4,1,2401
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.0.2310"
VALUE "FileVersion", "2.4.1.2401"
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.0.2310"
VALUE "ProductVersion", "2.4.1.2401"
END
END
BLOCK "VarFileInfo"
Expand Down
Loading