[farstream] Backport patch to ignore config while comparing send codecs
Brian Pepple
bpepple at fedoraproject.org
Sat Mar 3 22:25:21 UTC 2012
commit 64418392983215ccac6be58a502cad60ffa27ad7
Author: Brian Pepple <bpepple at fedoraproject.org>
Date: Sat Mar 3 17:25:13 2012 -0500
Backport patch to ignore config while comparing send codecs
...Ignore_config_while_comparing_send_codecs.patch | 40 ++++++++++++++++++++
farstream.spec | 7 +++-
2 files changed, 46 insertions(+), 1 deletions(-)
---
diff --git a/farstream-Ignore_config_while_comparing_send_codecs.patch b/farstream-Ignore_config_while_comparing_send_codecs.patch
new file mode 100644
index 0000000..838f193
--- /dev/null
+++ b/farstream-Ignore_config_while_comparing_send_codecs.patch
@@ -0,0 +1,40 @@
+From d9fa44186200e1cd17d69a1ae5b0dead202f7a58 Mon Sep 17 00:00:00 2001
+From: Olivier CrĂȘte <olivier.crete at collabora.com>
+Date: Tue, 28 Feb 2012 22:13:43 +0000
+Subject: rtpcodecnego: Ignore config while comparing send codecs
+
+---
+diff --git a/gst/fsrtpconference/fs-rtp-codec-negotiation.c b/gst/fsrtpconference/fs-rtp-codec-negotiation.c
+index 12f498f..a63faa0 100644
+--- a/gst/fsrtpconference/fs-rtp-codec-negotiation.c
++++ b/gst/fsrtpconference/fs-rtp-codec-negotiation.c
+@@ -1393,17 +1393,24 @@ lookup_codec_association_by_codec_for_sending (GList *codec_associations,
+ FsCodec *codec)
+ {
+ GList *item;
++ CodecAssociation *res = NULL;
++ FsCodec *tmpcodec = codec_copy_filtered (codec, FS_PARAM_TYPE_CONFIG);
+
+ for (item = codec_associations; item; item = g_list_next (item))
+ {
+ CodecAssociation *ca = item->data;
+
+ if (codec_association_is_valid_for_sending (ca, FALSE) &&
+- fs_codec_are_equal (ca->codec, codec))
+- return ca;
++ fs_codec_are_equal (ca->send_codec, tmpcodec))
++ {
++ res = ca;
++ break;
++ }
+ }
+
+- return NULL;
++ fs_codec_destroy (tmpcodec);
++
++ return res;
+ }
+
+ FsRtpHeaderExtension *
+--
+cgit v0.9
diff --git a/farstream.spec b/farstream.spec
index 260653d..283282f 100644
--- a/farstream.spec
+++ b/farstream.spec
@@ -5,12 +5,13 @@
Name: farstream
Version: 0.1.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Libraries for videoconferencing
License: LGPLv2+
URL: http://www.freedesktop.org/wiki/Software/Farstream
Source0: http://freedesktop.org/software/%{name}/releases/%{name}/%{name}-%{version}.tar.gz
+Patch0: farstream-Ignore_config_while_comparing_send_codecs.patch
BuildRequires: libnice-devel >= 0.1.0
BuildRequires: gstreamer-devel >= %{gst_ver}
@@ -63,6 +64,7 @@ developing applications that use %{name}.
%prep
%setup -q
+%patch0 -p1 -b .compare
%build
@@ -119,6 +121,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
%changelog
+* Sat Mar 3 2012 Brian Pepple <bpepple at fedoraproject.org> - 0.1.1-3
+- Backport patch to ignore config while comparing send codecs.
+
* Tue Feb 28 2012 Brian Pepple <bpepple at fedoraproject.org> - 0.1.1-2
- Appended isa macro to name in devel subpackage.
- Add obsolete/provide to devel subpackage.
More information about the scm-commits
mailing list