<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[183388] trunk</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/183388">183388</a></dd>
<dt>Author</dt> <dd>philn@webkit.org</dd>
<dt>Date</dt> <dd>2015-04-26 23:47:26 -0700 (Sun, 26 Apr 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>[JHBuild] Move to upstream OpenWebRTC
https://bugs.webkit.org/show_bug.cgi?id=144145

Reviewed by Carlos Garcia Campos.

.:

* Source/cmake/FindOpenWebRTC.cmake: Check the presence of the
owr-gst library.

Source/WebCore:

* platform/mediastream/openwebrtc/OpenWebRTCUtilities.cpp:
(WebCore::initializeOpenWebRTC): Update with new owr_init API.

Tools:

* efl/jhbuild.modules: Switch to upstream OpenWebRTC repository
and add a new simple patch to gst-plugins-base, required for
OpenWebRTC build.
* efl/patches/gst-plugins-base-rtp-rtcpbuffer-fix-typo-in-enum.patch: Added.
* gtk/jhbuild.modules: Ditto.
* gtk/patches/gst-plugins-base-rtp-rtcpbuffer-fix-typo-in-enum.patch: Added.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamopenwebrtcOpenWebRTCUtilitiescpp">trunk/Source/WebCore/platform/mediastream/openwebrtc/OpenWebRTCUtilities.cpp</a></li>
<li><a href="#trunkSourcecmakeFindOpenWebRTCcmake">trunk/Source/cmake/FindOpenWebRTC.cmake</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsefljhbuildmodules">trunk/Tools/efl/jhbuild.modules</a></li>
<li><a href="#trunkToolsgtkjhbuildmodules">trunk/Tools/gtk/jhbuild.modules</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkToolseflpatchesgstpluginsbasertprtcpbufferfixtypoinenumpatch">trunk/Tools/efl/patches/gst-plugins-base-rtp-rtcpbuffer-fix-typo-in-enum.patch</a></li>
<li><a href="#trunkToolsgtkpatchesgstpluginsbasertprtcpbufferfixtypoinenumpatch">trunk/Tools/gtk/patches/gst-plugins-base-rtp-rtcpbuffer-fix-typo-in-enum.patch</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (183387 => 183388)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog        2015-04-27 06:17:05 UTC (rev 183387)
+++ trunk/ChangeLog        2015-04-27 06:47:26 UTC (rev 183388)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-04-24  Philippe Normand  &lt;pnormand@igalia.com&gt;
+
+        [JHBuild] Move to upstream OpenWebRTC
+        https://bugs.webkit.org/show_bug.cgi?id=144145
+
+        Reviewed by Carlos Garcia Campos.
+
+        * Source/cmake/FindOpenWebRTC.cmake: Check the presence of the
+        owr-gst library.
+
</ins><span class="cx"> 2015-04-26  Yusuke Suzuki  &lt;utatane.tea@gmail.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [ES6] Implement ES6 template literals
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (183387 => 183388)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-04-27 06:17:05 UTC (rev 183387)
+++ trunk/Source/WebCore/ChangeLog        2015-04-27 06:47:26 UTC (rev 183388)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-04-24  Philippe Normand  &lt;pnormand@igalia.com&gt;
+
+        [JHBuild] Move to upstream OpenWebRTC
+        https://bugs.webkit.org/show_bug.cgi?id=144145
+
+        Reviewed by Carlos Garcia Campos.
+
+        * platform/mediastream/openwebrtc/OpenWebRTCUtilities.cpp:
+        (WebCore::initializeOpenWebRTC): Update with new owr_init API.
+
</ins><span class="cx"> 2015-04-17  Carlos Garcia Campos  &lt;cgarcia@igalia.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [SOUP] Add initial implementation of NetworkProcess disk cache
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamopenwebrtcOpenWebRTCUtilitiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/openwebrtc/OpenWebRTCUtilities.cpp (183387 => 183388)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/openwebrtc/OpenWebRTCUtilities.cpp        2015-04-27 06:17:05 UTC (rev 183387)
+++ trunk/Source/WebCore/platform/mediastream/openwebrtc/OpenWebRTCUtilities.cpp        2015-04-27 06:47:26 UTC (rev 183388)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> 
</span><span class="cx"> void initializeOpenWebRTC()
</span><span class="cx"> {
</span><del>-    owr_init_with_main_context(g_main_context_default());
</del><ins>+    owr_init(g_main_context_default());
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourcecmakeFindOpenWebRTCcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/FindOpenWebRTC.cmake (183387 => 183388)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/FindOpenWebRTC.cmake        2015-04-27 06:17:05 UTC (rev 183387)
+++ trunk/Source/cmake/FindOpenWebRTC.cmake        2015-04-27 06:47:26 UTC (rev 183388)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> 
</span><span class="cx"> find_package(PkgConfig)
</span><del>-pkg_check_modules(OPENWEBRTC openwebrtc-0.1)
</del><ins>+pkg_check_modules(OPENWEBRTC openwebrtc-0.1 openwebrtc-gst-0.1)
</ins><span class="cx"> 
</span><span class="cx"> set(VERSION_OK TRUE)
</span><span class="cx"> if (OPENWEBRTC_VERSION)
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (183387 => 183388)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog        2015-04-27 06:17:05 UTC (rev 183387)
+++ trunk/Tools/ChangeLog        2015-04-27 06:47:26 UTC (rev 183388)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-04-24  Philippe Normand  &lt;pnormand@igalia.com&gt;
+
+        [JHBuild] Move to upstream OpenWebRTC
+        https://bugs.webkit.org/show_bug.cgi?id=144145
+
+        Reviewed by Carlos Garcia Campos.
+
+        * efl/jhbuild.modules: Switch to upstream OpenWebRTC repository
+        and add a new simple patch to gst-plugins-base, required for
+        OpenWebRTC build.
+        * efl/patches/gst-plugins-base-rtp-rtcpbuffer-fix-typo-in-enum.patch: Added.
+        * gtk/jhbuild.modules: Ditto.
+        * gtk/patches/gst-plugins-base-rtp-rtcpbuffer-fix-typo-in-enum.patch: Added.
+
</ins><span class="cx"> 2015-04-26  Yusuke Suzuki  &lt;utatane.tea@gmail.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [ES6] Implement ES6 template literals
</span></span></pre></div>
<a id="trunkToolsefljhbuildmodules"></a>
<div class="modfile"><h4>Modified: trunk/Tools/efl/jhbuild.modules (183387 => 183388)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/efl/jhbuild.modules        2015-04-27 06:17:05 UTC (rev 183387)
+++ trunk/Tools/efl/jhbuild.modules        2015-04-27 06:47:26 UTC (rev 183388)
</span><span class="lines">@@ -256,6 +256,7 @@
</span><span class="cx">             repo=&quot;gstreamer&quot;
</span><span class="cx">             hash=&quot;sha256:49cd9e8f23c416b1607b43837a09833fa03e0106929d81ead2ddfde6c0ade44b&quot;
</span><span class="cx">             md5sum=&quot;0c42eca8f9e4efd56d2ce8e9249ce4a1&quot;&gt;
</span><ins>+      &lt;patch file=&quot;gst-plugins-base-rtp-rtcpbuffer-fix-typo-in-enum.patch&quot; strip=&quot;1&quot;/&gt;
</ins><span class="cx">     &lt;/branch&gt;
</span><span class="cx">   &lt;/autotools&gt;
</span><span class="cx"> 
</span><span class="lines">@@ -343,14 +344,14 @@
</span><span class="cx">     &lt;/branch&gt;
</span><span class="cx">   &lt;/autotools&gt;
</span><span class="cx"> 
</span><del>-  &lt;autotools id=&quot;openwebrtc&quot; autogenargs=&quot;--enable-bridge=no&quot;&gt;
</del><ins>+  &lt;autotools id=&quot;openwebrtc&quot; autogenargs=&quot;--enable-bridge=no --enable-owr-gst=yes&quot;&gt;
</ins><span class="cx">     &lt;dependencies&gt;
</span><span class="cx">       &lt;dep package=&quot;gst-plugins-openwebrtc&quot;/&gt;
</span><span class="cx">       &lt;dep package=&quot;libnice&quot;/&gt;
</span><span class="cx">      &lt;/dependencies&gt;
</span><del>-    &lt;branch repo=&quot;github.com&quot; module=&quot;WebRTCinWebKit/openwebrtc/archive/1598e6f612d257196db70d0cf930ede94f83497a.tar.gz&quot; checkoutdir=&quot;openwebrtc&quot; version=&quot;configurable-sinks&quot;
-            hash=&quot;sha256:584922ffd4cef9f991e6035bb6d87f6b09ded23e245d1ff15db3c0af9cddcf29&quot;
-            md5sum=&quot;1598e6f612d257196db70d0cf930ede94f83497a.tar.gz&quot; size=&quot;243435&quot;&gt;
</del><ins>+    &lt;branch repo=&quot;github.com&quot; module=&quot;EricssonResearch/openwebrtc/archive/13516c7f79a0c48bb411464f7613d4b426c70f5b.tar.gz&quot; checkoutdir=&quot;openwebrtc&quot; version=&quot;13516c7f79a0c48bb411464f7613d4b426c70f5b&quot;
+            hash=&quot;sha256:c849d36d97c17a198a5d9c180f13f14c7897c9236e2384ea11029e23b09b59ac&quot;
+            md5sum=&quot;13516c7f79a0c48bb411464f7613d4b426c70f5b.tar.gz&quot; size=&quot;258936&quot;&gt;
</ins><span class="cx">     &lt;/branch&gt;
</span><span class="cx">   &lt;/autotools&gt;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkToolseflpatchesgstpluginsbasertprtcpbufferfixtypoinenumpatch"></a>
<div class="addfile"><h4>Added: trunk/Tools/efl/patches/gst-plugins-base-rtp-rtcpbuffer-fix-typo-in-enum.patch (0 => 183388)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/efl/patches/gst-plugins-base-rtp-rtcpbuffer-fix-typo-in-enum.patch                                (rev 0)
+++ trunk/Tools/efl/patches/gst-plugins-base-rtp-rtcpbuffer-fix-typo-in-enum.patch        2015-04-27 06:47:26 UTC (rev 183388)
</span><span class="lines">@@ -0,0 +1,45 @@
</span><ins>+From dfc34c58411f50b37b2e1300560ae8a0b6a9a7d4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= &lt;tim@centricular.com&gt;
+Date: Tue, 7 Apr 2015 16:43:59 +0100
+Subject: [PATCH] rtp: rtcpbuffer: fix typo in enum
+
+and in docs. Spotted by Rob Swain.
+---
+ gst-libs/gst/rtp/gstrtcpbuffer.h | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/gst-libs/gst/rtp/gstrtcpbuffer.h b/gst-libs/gst/rtp/gstrtcpbuffer.h
+index b5ff4a1..47378cf 100644
+--- a/gst-libs/gst/rtp/gstrtcpbuffer.h
++++ b/gst-libs/gst/rtp/gstrtcpbuffer.h
+@@ -59,6 +59,9 @@ typedef enum
+   GST_RTCP_TYPE_PSFB    = 206
+ } GstRTCPType;

++/* FIXME 2.0: backwards compatibility define for enum typo */
++#define GST_RTCP_RTPFB_TYPE_RCTP_SR_REQ GST_RTCP_RTPFB_TYPE_RTCP_SR_REQ
++
+ /**
+  * GstRTCPFBType:
+  * @GST_RTCP_FB_TYPE_INVALID: Invalid type
+@@ -66,7 +69,7 @@ typedef enum
+  * @GST_RTCP_RTPFB_TYPE_TMMBR: Temporary Maximum Media Stream Bit Rate Request
+  * @GST_RTCP_RTPFB_TYPE_TMMBN: Temporary Maximum Media Stream Bit Rate
+  *    Notification
+- * @GST_RTCP_RTPFB_TYPE_RTCP_SR_SEQ: Request an SR packet for early
++ * @GST_RTCP_RTPFB_TYPE_RTCP_SR_REQ: Request an SR packet for early
+  *    synchronization
+  * @GST_RTCP_PSFB_TYPE_PLI: Picture Loss Indication
+  * @GST_RTCP_PSFB_TYPE_SLI: Slice Loss Indication
+@@ -89,7 +92,7 @@ typedef enum
+   GST_RTCP_RTPFB_TYPE_TMMBR       = 3,
+   GST_RTCP_RTPFB_TYPE_TMMBN       = 4,
+   /* RTPFB types assigned in RFC 6051 */
+-  GST_RTCP_RTPFB_TYPE_RCTP_SR_REQ = 5,
++  GST_RTCP_RTPFB_TYPE_RTCP_SR_REQ = 5,
+   /* PSFB types */
+   GST_RTCP_PSFB_TYPE_PLI          = 1,
+   GST_RTCP_PSFB_TYPE_SLI          = 2,
+-- 
+2.1.4
+
</ins></span></pre></div>
<a id="trunkToolsgtkjhbuildmodules"></a>
<div class="modfile"><h4>Modified: trunk/Tools/gtk/jhbuild.modules (183387 => 183388)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/gtk/jhbuild.modules        2015-04-27 06:17:05 UTC (rev 183387)
+++ trunk/Tools/gtk/jhbuild.modules        2015-04-27 06:47:26 UTC (rev 183388)
</span><span class="lines">@@ -292,6 +292,7 @@
</span><span class="cx">             repo=&quot;gstreamer&quot;
</span><span class="cx">             hash=&quot;sha256:49cd9e8f23c416b1607b43837a09833fa03e0106929d81ead2ddfde6c0ade44b&quot;
</span><span class="cx">             md5sum=&quot;0c42eca8f9e4efd56d2ce8e9249ce4a1&quot;&gt;
</span><ins>+      &lt;patch file=&quot;gst-plugins-base-rtp-rtcpbuffer-fix-typo-in-enum.patch&quot; strip=&quot;1&quot;/&gt;
</ins><span class="cx">     &lt;/branch&gt;
</span><span class="cx">   &lt;/autotools&gt;
</span><span class="cx"> 
</span><span class="lines">@@ -381,12 +382,12 @@
</span><span class="cx">     &lt;branch repo=&quot;freedesktop-git&quot; module=&quot;libnice/libnice.git&quot; tag=&quot;0.1.10&quot; checkoutdir=&quot;libnice&quot;/&gt;
</span><span class="cx">   &lt;/autotools&gt;
</span><span class="cx"> 
</span><del>-  &lt;autotools id=&quot;openwebrtc&quot; autogenargs=&quot;--enable-bridge=no&quot;&gt;
</del><ins>+  &lt;autotools id=&quot;openwebrtc&quot; autogenargs=&quot;--enable-bridge=no --enable-owr-gst=yes&quot;&gt;
</ins><span class="cx">     &lt;dependencies&gt;
</span><span class="cx">       &lt;dep package=&quot;gst-plugins-openwebrtc&quot;/&gt;
</span><span class="cx">       &lt;dep package=&quot;libnice&quot;/&gt;
</span><span class="cx">      &lt;/dependencies&gt;
</span><del>-    &lt;branch repo=&quot;github.com&quot; module=&quot;WebRTCinWebKit/openwebrtc.git&quot; checkoutdir=&quot;openwebrtc&quot; tag=&quot;1598e6f612d257196db70d0cf930ede94f83497a&quot;/&gt;
</del><ins>+    &lt;branch repo=&quot;github.com&quot; module=&quot;EricssonResearch/openwebrtc.git&quot; checkoutdir=&quot;openwebrtc&quot; tag=&quot;13516c7f79a0c48bb411464f7613d4b426c70f5b&quot;/&gt;
</ins><span class="cx">   &lt;/autotools&gt;
</span><span class="cx"> 
</span><span class="cx"> &lt;/moduleset&gt;
</span></span></pre></div>
<a id="trunkToolsgtkpatchesgstpluginsbasertprtcpbufferfixtypoinenumpatch"></a>
<div class="addfile"><h4>Added: trunk/Tools/gtk/patches/gst-plugins-base-rtp-rtcpbuffer-fix-typo-in-enum.patch (0 => 183388)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/gtk/patches/gst-plugins-base-rtp-rtcpbuffer-fix-typo-in-enum.patch                                (rev 0)
+++ trunk/Tools/gtk/patches/gst-plugins-base-rtp-rtcpbuffer-fix-typo-in-enum.patch        2015-04-27 06:47:26 UTC (rev 183388)
</span><span class="lines">@@ -0,0 +1,45 @@
</span><ins>+From dfc34c58411f50b37b2e1300560ae8a0b6a9a7d4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= &lt;tim@centricular.com&gt;
+Date: Tue, 7 Apr 2015 16:43:59 +0100
+Subject: [PATCH] rtp: rtcpbuffer: fix typo in enum
+
+and in docs. Spotted by Rob Swain.
+---
+ gst-libs/gst/rtp/gstrtcpbuffer.h | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/gst-libs/gst/rtp/gstrtcpbuffer.h b/gst-libs/gst/rtp/gstrtcpbuffer.h
+index b5ff4a1..47378cf 100644
+--- a/gst-libs/gst/rtp/gstrtcpbuffer.h
++++ b/gst-libs/gst/rtp/gstrtcpbuffer.h
+@@ -59,6 +59,9 @@ typedef enum
+   GST_RTCP_TYPE_PSFB    = 206
+ } GstRTCPType;

++/* FIXME 2.0: backwards compatibility define for enum typo */
++#define GST_RTCP_RTPFB_TYPE_RCTP_SR_REQ GST_RTCP_RTPFB_TYPE_RTCP_SR_REQ
++
+ /**
+  * GstRTCPFBType:
+  * @GST_RTCP_FB_TYPE_INVALID: Invalid type
+@@ -66,7 +69,7 @@ typedef enum
+  * @GST_RTCP_RTPFB_TYPE_TMMBR: Temporary Maximum Media Stream Bit Rate Request
+  * @GST_RTCP_RTPFB_TYPE_TMMBN: Temporary Maximum Media Stream Bit Rate
+  *    Notification
+- * @GST_RTCP_RTPFB_TYPE_RTCP_SR_SEQ: Request an SR packet for early
++ * @GST_RTCP_RTPFB_TYPE_RTCP_SR_REQ: Request an SR packet for early
+  *    synchronization
+  * @GST_RTCP_PSFB_TYPE_PLI: Picture Loss Indication
+  * @GST_RTCP_PSFB_TYPE_SLI: Slice Loss Indication
+@@ -89,7 +92,7 @@ typedef enum
+   GST_RTCP_RTPFB_TYPE_TMMBR       = 3,
+   GST_RTCP_RTPFB_TYPE_TMMBN       = 4,
+   /* RTPFB types assigned in RFC 6051 */
+-  GST_RTCP_RTPFB_TYPE_RCTP_SR_REQ = 5,
++  GST_RTCP_RTPFB_TYPE_RTCP_SR_REQ = 5,
+   /* PSFB types */
+   GST_RTCP_PSFB_TYPE_PLI          = 1,
+   GST_RTCP_PSFB_TYPE_SLI          = 2,
+-- 
+2.1.4
+
</ins></span></pre>
</div>
</div>

</body>
</html>