From: Automerge Script <automerge@asterisk.org>
Date: Thu, 25 Jan 2007 20:17:14 +0000 (+0000)
Subject: automerge commit
X-Git-Tag: 1.2.15-netsec~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fb41b21e016a8cf5d8c6604176f4256f54c488f1;p=thirdparty%2Fasterisk.git

automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@52307 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/jitterbuf.c b/jitterbuf.c
index c952b9c62a..7e494a994b 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)