[asterisk-commits] channel.c: Fix invalid reference in conditionaled out code. (asterisk[15])

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Tue Sep 26 07:06:10 CDT 2017


Joshua Colp has submitted this change and it was merged. ( https://gerrit.asterisk.org/6588 )

Change subject: channel.c: Fix invalid reference in conditionaled out code.
......................................................................

channel.c: Fix invalid reference in conditionaled out code.

ASTERISK-27289

Change-Id: I7a415948116493050614d9f4fa91ffbe0c21ec4c
---
M main/channel.c
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Joshua Colp: Looks good to me, but someone else must approve; Approved for Submit
  George Joseph: Looks good to me, approved



diff --git a/main/channel.c b/main/channel.c
index ecc771c..7d6e5db 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -4060,7 +4060,7 @@
 				}
 #else
 				int jump = calc_monitor_jump((ast_channel_outsmpl(chan) - ast_channel_insmpl(chan)),
-					ast_format_get_sample_rate(f->subclass.codec),
+					ast_format_get_sample_rate(f->subclass.format),
 					ast_format_get_sample_rate(ast_channel_monitor(chan)->read_stream->fmt->format));
 				if (jump - MONITOR_DELAY >= 0) {
 					if (ast_seekstream(ast_channel_monitor(chan)->read_stream, jump - f->samples, SEEK_FORCECUR) == -1) {
@@ -5203,7 +5203,7 @@
 				}
 #else
 				int jump = calc_monitor_jump((ast_channel_insmpl(chan) - ast_channel_outsmpl(chan)),
-				                             ast_format_get_sample_rate(f->subclass.codec),
+				                             ast_format_get_sample_rate(f->subclass.format),
 				                             ast_format_get_sample_rate(ast_channel_monitor(chan)->read_stream->fmt->format));
 				if (jump - MONITOR_DELAY >= 0) {
 					if (ast_seekstream(ast_channel_monitor(chan)->write_stream, jump - cur->samples, SEEK_FORCECUR) == -1) {

-- 
To view, visit https://gerrit.asterisk.org/6588
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: 15
Gerrit-MessageType: merged
Gerrit-Change-Id: I7a415948116493050614d9f4fa91ffbe0c21ec4c
Gerrit-Change-Number: 6588
Gerrit-PatchSet: 1
Gerrit-Owner: Richard Mudgett <rmudgett at digium.com>
Gerrit-Reviewer: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Jenkins2
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-commits/attachments/20170926/9f463029/attachment.html>


More information about the asterisk-commits mailing list