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 c952b9c62aed0d0ae00215cc633b6b4f8028f285..7e494a994b9b8fecd7d89b8d033ace5d0153b2dd 100644 (file)
--- 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)