Skip to content

Commit

Permalink
update openh264 version to v2.4.0 (#3691)
Browse files Browse the repository at this point in the history
  • Loading branch information
@BenzhengZhang
BenzhengZhang authored Oct 27, 2023
1 parent 15d02fc commit 34e14ea
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion Makefile
View file
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.3.0
FULL_VERSION := 2.4.0

ifeq (,$(wildcard $(SRC_PATH)gmp-api))
HAVE_GMP_API=No
Expand Down
4 changes: 2 additions & 2 deletions build/platform-darwin.mk
View file
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.4.0
COMPATIBILITY_VERSION := 2.4.0
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
View file
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, 4, 0, 2310};
static const char* const g_strCodecVer = "OpenH264 version:2.4.0.2310";

#define OPENH264_MAJOR (2)
#define OPENH264_MINOR (3)
#define OPENH264_MINOR (4)
#define OPENH264_REVISION (0)
#define OPENH264_RESERVED (2206)
#define OPENH264_RESERVED (2310)

#endif // CODEC_VER_H
2 changes: 1 addition & 1 deletion gmpopenh264.info
View file
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.4.0
APIs: encode-video[h264], decode-video[h264]
2 changes: 1 addition & 1 deletion meson.build
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
project('openh264', ['c', 'cpp'],
version : '2.3.0',
version : '2.4.0',
meson_version : '>= 0.52',
default_options : [ 'warning_level=1',
'buildtype=debugoptimized' ])
Expand Down
8 changes: 4 additions & 4 deletions openh264.rc
View file
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,4,0,2310
PRODUCTVERSION 2,4,0,2310
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.4.0.2310"
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.4.0.2310"
END
END
BLOCK "VarFileInfo"
Expand Down

4 comments on commit 34e14ea

@wpoe3ster
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

????

@ahmadmushtaq5
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makefile

@ahmadmushtaq5
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

//The current file is auto-generated by script: generate_codec_ver.sh
#ifndef CODEC_VER_H
#define CODEC_VER_H

#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";

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

#endif // CODEC_VER_H

@ahmadmushtaq5
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 2 resource.
//
#include "windows.h"

/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS

/////////////////////////////////////////////////////////////////////////////
// English (U.S.) resources

#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
#ifdef _WIN32
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#pragma code_page(1252)
#endif //_WIN32

/////////////////////////////////////////////////////////////////////////////
//
// Version
//

VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,4,0,2310
PRODUCTVERSION 2,4,0,2310
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
#else
FILEFLAGS 0x0L
#endif
FILEOS 0x40004L
FILETYPE 0x2L
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "Comments", "Cisco OpenH264 codec"
VALUE "CompanyName", "Cisco Systems Inc."
VALUE "FileDescription", "Cisco OpenH264 codec"
VALUE "FileVersion", "2.4.0.2310"
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"
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x409, 1200
END
END

#endif // English (U.S.) resources
/////////////////////////////////////////////////////////////////////////////

Please sign in to comment.