import openh264-2.4.1-1.el9

.gitignore

@@ -1,3 +1,3 @@
 SOURCES/gmp-api-e7d30b9.tar.gz
 SOURCES/gst-plugins-bad-openh264-1.22.1.tar.xz
-SOURCES/openh264-2.4.0.tar.gz
+SOURCES/openh264-2.4.1.tar.gz

.openh264.metadata

@@ -1,3 +1,3 @@
 de8f6395a21b2005d04e105642538b68cfa07049  SOURCES/gmp-api-e7d30b9.tar.gz
 075f967360587e4ded76ba8b2cc25e6fdd8bbfbd  SOURCES/gst-plugins-bad-openh264-1.22.1.tar.xz
-6777ef01daea39648d761df2b2b9661de2d3c44e  SOURCES/openh264-2.4.0.tar.gz
+4c12ca6790c66900ecd24c12a624fa01490e823b  SOURCES/openh264-2.4.1.tar.gz

SOURCES/0001-Fix-off-by-one-regression-in-decoder-3704.patch

@@ -1,29 +0,0 @@
-From fd66e67ac6136aff80b1567488568ba1ed7e8fb8 Mon Sep 17 00:00:00 2001
-From: Kalev Lember <klember@redhat.com>
-Date: Mon, 4 Dec 2023 07:54:04 +0100
-Subject: [PATCH] Fix off by one regression in decoder (#3704)
-
-Fix iPicBuffIdx bounds check introduced in commit
-986bd65b711191d4883c54ace32a9879e17729c2 and allow 0 as an index value.
-
-This fixes Big_Buck_Bunny_720_10s_30MB.mp4 playback with gst-play-1.0.
----
- codec/decoder/plus/src/welsDecoderExt.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/codec/decoder/plus/src/welsDecoderExt.cpp b/codec/decoder/plus/src/welsDecoderExt.cpp
-index 170d17de..457effb6 100644
---- a/codec/decoder/plus/src/welsDecoderExt.cpp
-+++ b/codec/decoder/plus/src/welsDecoderExt.cpp
-@@ -1136,7 +1136,7 @@ void CWelsDecoder::ReleaseBufferedReadyPictureReorder (PWelsDecoderContext pCtx,
-       m_sPictInfoList[m_sReoderingStatus.iPictInfoIndex].iPOC = IMinInt32;
-       int32_t iPicBuffIdx = m_sPictInfoList[m_sReoderingStatus.iPictInfoIndex].iPicBuffIdx;
-       if (pPicBuff != NULL) {
--        if (iPicBuffIdx > 0 && iPicBuffIdx < pPicBuff->iCapacity)
-+        if (iPicBuffIdx >= 0 && iPicBuffIdx < pPicBuff->iCapacity)
-         {
-             PPicture pPic = pPicBuff->ppPic[iPicBuffIdx];
-             --pPic->iRefCount;
--- 
-2.41.0
-

SPECS/openh264.spec

@@ -3,7 +3,7 @@
 %global commit1 e7d30b921df736a1121a0c8e0cf3ab1ce5b8a4b7
 %global shortcommit1 %(c=%{commit1}; echo ${c:0:7})
 
-%global openh264_version 2.4.0
+%global openh264_version 2.4.1
 %global gst_version 1.22.1
 
 # Filter out soname provides for the mozilla plugin
@@ -12,7 +12,7 @@
 Name:           openh264
 Version:        %{openh264_version}
 # Also bump the Release tag for gstreamer1-plugin-openh264 down below
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        H.264 codec library
 
 License:        BSD-2-Clause
@@ -25,9 +25,6 @@ Source1:        https://github.com/mozilla/gmp-api/archive/%{commit1}/gmp-api-%{
 Source2:        gst-plugins-bad-openh264-%{gst_version}.tar.xz
 Source3:        gst-p-bad-cleanup.sh
 
-# Backported from upstream
-# https://github.com/cisco/openh264/pull/3704
-Patch1:         0001-Fix-off-by-one-regression-in-decoder-3704.patch
 # Don't use pkg-config for finding openh264 as we are building against an in-tree copy
 Patch2:         hardcode-openh264-dep.patch
 
@@ -69,7 +66,7 @@ browsers.
 
 %package     -n gstreamer1-plugin-openh264
 Version:        %{gst_version}
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        GStreamer H.264 plugin
 
 %description -n gstreamer1-plugin-openh264
@@ -81,7 +78,6 @@ This package contains the H.264 plugin.
 
 %prep
 %setup -q
-%patch1 -p1
 
 # Extract gmp-api archive
 tar -xf %{S:1}
@@ -238,6 +234,9 @@ popd
 
 
 %changelog
+* Fri Feb 02 2024 Kalev Lember <klember@redhat.com> - 2.4.1-1
+- Update to 2.4.1
+
 * Mon Dec 04 2023 Kalev Lember <klember@redhat.com> - 2.4.0-2
 - Fix off by one regression in decoder
 - Filter out soname provides for mozilla gmp plugin