<p>Joshua Colp <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/6589">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
George Joseph: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">channel.c: Fix invalid reference in conditionaled out code.<br><br>ASTERISK-27289<br><br>Change-Id: I7a415948116493050614d9f4fa91ffbe0c21ec4c<br>---<br>M main/channel.c<br>1 file changed, 2 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/main/channel.c b/main/channel.c<br>index ecc771c..7d6e5db 100644<br>--- a/main/channel.c<br>+++ b/main/channel.c<br>@@ -4060,7 +4060,7 @@<br> }<br> #else<br> int jump = calc_monitor_jump((ast_channel_outsmpl(chan) - ast_channel_insmpl(chan)),<br>- ast_format_get_sample_rate(f->subclass.codec),<br>+ ast_format_get_sample_rate(f->subclass.format),<br> ast_format_get_sample_rate(ast_channel_monitor(chan)->read_stream->fmt->format));<br> if (jump - MONITOR_DELAY >= 0) {<br> if (ast_seekstream(ast_channel_monitor(chan)->read_stream, jump - f->samples, SEEK_FORCECUR) == -1) {<br>@@ -5203,7 +5203,7 @@<br> }<br> #else<br> int jump = calc_monitor_jump((ast_channel_insmpl(chan) - ast_channel_outsmpl(chan)),<br>- ast_format_get_sample_rate(f->subclass.codec),<br>+ ast_format_get_sample_rate(f->subclass.format),<br> ast_format_get_sample_rate(ast_channel_monitor(chan)->read_stream->fmt->format));<br> if (jump - MONITOR_DELAY >= 0) {<br> if (ast_seekstream(ast_channel_monitor(chan)->write_stream, jump - cur->samples, SEEK_FORCECUR) == -1) {<br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/6589">change 6589</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/6589"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I7a415948116493050614d9f4fa91ffbe0c21ec4c </div>
<div style="display:none"> Gerrit-Change-Number: 6589 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Richard Mudgett <rmudgett@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins2 </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@digium.com> </div>