diff options
| author | Jenkins2 <jenkins2@gerrit.asterisk.org> | 2017-09-26 06:47:22 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-09-26 06:47:22 -0500 |
| commit | 9bd204f64a4010cbe40432ffda265c5f43da4dbb (patch) | |
| tree | 9aafc397fa95f82ce3042de75b894b34dbcd0af1 | |
| parent | 9fe0803c8bc062d79ed722d44867045175994bce (diff) | |
| parent | 787fd967094a2fd9138dd8e11586250847a02c4b (diff) | |
Merge "channel.c: Fix invalid reference in conditionaled out code." into 14
| -rw-r--r-- | main/channel.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/channel.c b/main/channel.c index 3e5674a05..970d81373 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) { |