From 3ea8076b282a49e38d56a6bb3b775028a37bb9e7 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Mon, 8 Jun 2015 18:03:47 +0200 Subject: [PATCH] Update to 1.5.1 - Drop old patch --- ...ort-for-RTP-RTCP-mixing-if-data-arri.patch | 47 ------------------- gstreamer1-plugins-bad-free.spec | 3 +- 2 files changed, 1 insertion(+), 49 deletions(-) delete mode 100644 0001-srtpdec-Add-support-for-RTP-RTCP-mixing-if-data-arri.patch diff --git a/0001-srtpdec-Add-support-for-RTP-RTCP-mixing-if-data-arri.patch b/0001-srtpdec-Add-support-for-RTP-RTCP-mixing-if-data-arri.patch deleted file mode 100644 index 701ca5e..0000000 --- a/0001-srtpdec-Add-support-for-RTP-RTCP-mixing-if-data-arri.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 3c8039642448e7ad383b2cd588f54e396e1788a8 Mon Sep 17 00:00:00 2001 -From: Youness Alaoui -Date: Tue, 5 Aug 2014 14:06:07 -0400 -Subject: [PATCH] srtpdec: Add support for RTP/RTCP mixing if data arrives on - RTCP pad - -https://bugzilla.gnome.org/show_bug.cgi?id=734321 ---- - ext/srtp/gstsrtpdec.c | 18 ++++++++---------- - 1 file changed, 8 insertions(+), 10 deletions(-) - -diff --git a/ext/srtp/gstsrtpdec.c b/ext/srtp/gstsrtpdec.c -index 5d42f44..892f683 100644 ---- a/ext/srtp/gstsrtpdec.c -+++ b/ext/srtp/gstsrtpdec.c -@@ -560,20 +560,18 @@ validate_buffer (GstSrtpDec * filter, GstBuffer * buf, guint32 * ssrc, - gboolean * is_rtcp) - { - GstSrtpDecSsrcStream *stream = NULL; -+ GstRTPBuffer rtpbuf = GST_RTP_BUFFER_INIT; - -- if (!(*is_rtcp)) { -- GstRTPBuffer rtpbuf = GST_RTP_BUFFER_INIT; -+ if (gst_rtp_buffer_map (buf, GST_MAP_READ, &rtpbuf)) { -+ if (gst_rtp_buffer_get_payload_type (&rtpbuf) < 64 -+ || gst_rtp_buffer_get_payload_type (&rtpbuf) > 80) { -+ *ssrc = gst_rtp_buffer_get_ssrc (&rtpbuf); - -- if (gst_rtp_buffer_map (buf, GST_MAP_READ, &rtpbuf)) { -- if (gst_rtp_buffer_get_payload_type (&rtpbuf) < 64 -- || gst_rtp_buffer_get_payload_type (&rtpbuf) > 80) { -- *ssrc = gst_rtp_buffer_get_ssrc (&rtpbuf); -- -- gst_rtp_buffer_unmap (&rtpbuf); -- goto have_ssrc; -- } - gst_rtp_buffer_unmap (&rtpbuf); -+ *is_rtcp = FALSE; -+ goto have_ssrc; - } -+ gst_rtp_buffer_unmap (&rtpbuf); - } - - if (rtcp_buffer_get_ssrc (buf, ssrc)) { --- -2.1.0 - diff --git a/gstreamer1-plugins-bad-free.spec b/gstreamer1-plugins-bad-free.spec index a8c31ab..44438d9 100644 --- a/gstreamer1-plugins-bad-free.spec +++ b/gstreamer1-plugins-bad-free.spec @@ -30,7 +30,6 @@ URL: http://gstreamer.freedesktop.org/ %endif Source0: gst-plugins-bad-free-%{version}.tar.xz Source1: gst-p-bad-cleanup.sh -Patch1: 0001-srtpdec-Add-support-for-RTP-RTCP-mixing-if-data-arri.patch BuildRequires: gstreamer1-devel >= %{version} BuildRequires: gstreamer1-plugins-base-devel >= %{version} @@ -158,7 +157,6 @@ aren't tested well enough, or the code is not of good enough quality. %prep %setup -q -n gst-plugins-bad-%{version} -%patch1 -p1 %build @@ -414,6 +412,7 @@ chrpath --delete $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{majorminor}/libgstcamerab %changelog * Mon Jun 08 2015 Wim Taymans - 1.5.1-1 - Update to 1.5.1 +- Drop old patch * Mon May 04 2015 Kalev Lember - 1.4.5-5 - Rebuilt for nettle soname bump