diff options
| author | Joshua Colp <jcolp@digium.com> | 2017-09-26 07:06:09 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-09-26 07:06:09 -0500 |
| commit | 63c9f838ad2d8b702a2b8c13e2c20b99cb7f1d42 (patch) | |
| tree | 791d455a3bdc3f6dca21c901ddbc159c9aaa5e32 | |
| parent | 0220915cb2482ac378c79cccf44b2a41f003168a (diff) | |
| parent | 1728e439e84087e2e6cf9cb3e2fb0899ef6696f9 (diff) | |
Merge "channel.c: Fix invalid reference in conditionaled out code." into 15
| -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 ecc771c1d..7d6e5db07 100644 --- a/main/channel.c +++ b/main/channel.c @@ -4060,7 +4060,7 @@ static struct ast_frame *__ast_read(struct ast_channel *chan, int dropaudio, int } #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 @@ int ast_write_stream(struct ast_channel *chan, int stream_num, struct ast_frame } #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) { |