aboutsummaryrefslogtreecommitdiffstats
path: root/jitterbuf.c
diff options
context:
space:
mode:
authorautomerge <automerge@f38db490-d61c-443f-a65b-d21fe96a405b>2007-01-25 20:17:14 +0000
committerautomerge <automerge@f38db490-d61c-443f-a65b-d21fe96a405b>2007-01-25 20:17:14 +0000
commit75fcbfff8fff0bab2e24eaacf1855000edac4a96 (patch)
treed8e3742ddc89a1118c8954789e9c563beb68153f /jitterbuf.c
parentac5cb6723fe2422bab6ae136ae2a6bab70aadec4 (diff)
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@52307 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'jitterbuf.c')
-rw-r--r--jitterbuf.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/jitterbuf.c b/jitterbuf.c
index c952b9c62..7e494a994 100644
--- a/jitterbuf.c
+++ b/jitterbuf.c
@@ -761,8 +761,8 @@ static int _jb_get(jitterbuf *jb, jb_frame *frameout, long now, long interpl)
long jb_next(jitterbuf *jb)
{
if (jb->info.silence_begin_ts) {
- long next = queue_next(jb);
- if (next > 0) {
+ if (jb->frames) {
+ long next = queue_next(jb);
history_get(jb);
/* shrink during silence */
if (jb->info.target - jb->info.current < -JB_TARGET_EXTRA)