<p>Joshua Colp <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/8985">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Joshua Colp: Looks good to me, but someone else must approve; Approved for Submit
  Matthew Fredrickson: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">rtp_engine: Remove the double assigned RTP payload ID of H.263+.<br><br>Mantis-3709 (Commit 68ff3c3, Asterisk 1.2) added support for the video format<br>H.263+. For this, the RTP payload ID 103 got assigned statically. Commit f1aadc8<br>assigned another payload ID 98 for this format in Asterisk 1.6.<br><br>Change-Id: I90e35b158487f8f1f8187da6241b54cd3b74e667<br>---<br>M main/rtp_engine.c<br>1 file changed, 1 insertion(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/main/rtp_engine.c b/main/rtp_engine.c<br>index 9292cda..f5f32eb 100644<br>--- a/main/rtp_engine.c<br>+++ b/main/rtp_engine.c<br>@@ -2755,7 +2755,7 @@<br>       add_static_payload(31, ast_format_h261, 0);<br>   add_static_payload(34, ast_format_h263, 0);<br>   add_static_payload(97, ast_format_ilbc, 0);<br>-  add_static_payload(98, ast_format_h263p, 0);<br>+<br>       add_static_payload(99, ast_format_h264, 0);<br>   add_static_payload(101, NULL, AST_RTP_DTMF);<br>  add_static_payload(102, ast_format_siren7, 0);<br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/8985">change 8985</a>. To unsubscribe, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/8985"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 13 </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I90e35b158487f8f1f8187da6241b54cd3b74e667 </div>
<div style="display:none"> Gerrit-Change-Number: 8985 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Alexander Traud <pabstraud@compuserve.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins2 </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Matthew Fredrickson <creslin@digium.com> </div>