commit 344b8af379701a7e58b4ffb3cbac1517eff079fd
Author: Jakub Bogusz <[email protected]>
Date: Fri Aug 9 15:45:42 2019 +0200
- added openh264 patch (fix build with openh264 >= 2); release 7
mediastreamer-plugin-msopenh264-openh264.patch | 22 ++++++++++++++++++++++
mediastreamer-plugin-msopenh264.spec | 4 +++-
2 files changed, 25 insertions(+), 1 deletion(-)
---
diff --git a/mediastreamer-plugin-msopenh264.spec
b/mediastreamer-plugin-msopenh264.spec
index 1f83162..15e8bb9 100644
--- a/mediastreamer-plugin-msopenh264.spec
+++ b/mediastreamer-plugin-msopenh264.spec
@@ -2,11 +2,12 @@ Summary: H.264 video codec for mediastreamer based on
the openh264 library
Summary(pl.UTF-8): Kodek obrazu H.264 dla mediastreamera oparty na
bibliotece openh264
Name: mediastreamer-plugin-msopenh264
Version: 1.2.1
-Release: 6
+Release: 7
License: GPL v2+
Group: Libraries
Source0:
https://linphone.org/releases/sources/plugins/msopenh264/msopenh264-%{version}.tar.gz
# Source0-md5: 8e4dfaed03dbe10d1b32d70eea23ce9c
+Patch0: %{name}-openh264.patch
URL: http://www.linphone.org/technical-corner/mediastreamer2/overview
BuildRequires: autoconf >= 2.50
BuildRequires: automake
@@ -29,6 +30,7 @@ opartą na bibliotece openh264.
%prep
%setup -q -n msopenh264-%{version}
+%patch0 -p1
%build
%{__libtoolize}
diff --git a/mediastreamer-plugin-msopenh264-openh264.patch
b/mediastreamer-plugin-msopenh264-openh264.patch
new file mode 100644
index 0000000..370f5bd
--- /dev/null
+++ b/mediastreamer-plugin-msopenh264-openh264.patch
@@ -0,0 +1,22 @@
+--- msopenh264-1.2.1/src/msopenh264dec.cpp.orig 2016-10-19
17:32:52.000000000 +0200
++++ msopenh264-1.2.1/src/msopenh264dec.cpp 2019-08-09 15:28:46.157866126
+0200
+@@ -62,7 +62,7 @@
+ mUnpacker=rfc3984_new();
+ if (mDecoder != 0) {
+ SDecodingParam params = { 0 };
+-#if (OPENH264_MAJOR == 1) && (OPENH264_MINOR >=6)
++#if (OPENH264_MAJOR > 1) || ((OPENH264_MAJOR == 1) && (OPENH264_MINOR >=6))
+ #else
+ params.eOutputColorFormat = videoFormatI420;
+ #endif
+--- msopenh264-1.2.1/src/msopenh264enc.cpp.orig 2017-07-20
15:56:32.000000000 +0200
++++ msopenh264-1.2.1/src/msopenh264enc.cpp 2019-08-09 15:30:24.520666582
+0200
+@@ -127,7 +127,7 @@
+ params.sSpatialLayers[0].iSpatialBitrate =
targetBitrate;
+ params.sSpatialLayers[0].iMaxSpatialBitrate =
maxBitrate;
+
+-#if (OPENH264_MAJOR == 1) && (OPENH264_MINOR >=6)
++#if (OPENH264_MAJOR > 1) || ((OPENH264_MAJOR == 1) && (OPENH264_MINOR >=6))
+ params.sSpatialLayers[0].sSliceArgument.uiSliceMode =
SM_SIZELIMITED_SLICE;
+
params.sSpatialLayers[0].sSliceArgument.uiSliceSizeConstraint =
ms_factory_get_payload_max_size(mFilter->factory);
+ #else
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mediastreamer-plugin-msopenh264.git/commitdiff/344b8af379701a7e58b4ffb3cbac1517eff079fd
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
