From: Richard Mudgett Date: Mon, 25 Sep 2017 15:59:17 +0000 (-0500) Subject: channel.c: Fix invalid reference in conditionaled out code. X-Git-Tag: 14.7.0-rc1~37^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=787fd967094a2fd9138dd8e11586250847a02c4b;p=thirdparty%2Fasterisk.git channel.c: Fix invalid reference in conditionaled out code. ASTERISK-27289 Change-Id: I7a415948116493050614d9f4fa91ffbe0c21ec4c --- diff --git a/main/channel.c b/main/channel.c index 3e5674a05d..970d81373c 100644 --- a/main/channel.c +++ b/main/channel.c @@ -4293,7 +4293,7 @@ static struct ast_frame *__ast_read(struct ast_channel *chan, int dropaudio) } #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) { @@ -5375,7 +5375,7 @@ int ast_write(struct ast_channel *chan, struct ast_frame *fr) } #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) {