From: Joshua Colp <jcolp@digium.com>
Date: Mon, 18 May 2009 15:55:45 +0000 (+0000)
Subject: Merged revisions 195207 via svnmerge from
X-Git-Tag: 1.6.1.3-rc1~229
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=30106e37d01726e5d5a477d2321a3683560cd3cd;p=thirdparty%2Fasterisk.git

Merged revisions 195207 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r195207 | file | 2009-05-18 12:53:26 -0300 (Mon, 18 May 2009) | 14 lines

  Merged revisions 195206 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r195206 | file | 2009-05-18 12:51:22 -0300 (Mon, 18 May 2009) | 7 lines

    Fix a typo which caused loss of audio when using G729 in some scenarios with a smoother present.

    (closes issue #15105)
    Reported by: bamby
    Patches:
          process-vad-correctly.diff uploaded by bamby (license 430)
  ........
................


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

diff --git a/main/frame.c b/main/frame.c
index 0768756e54..a14ed53985 100644
--- a/main/frame.c
+++ b/main/frame.c
@@ -254,7 +254,7 @@ struct ast_frame *ast_smoother_read(struct ast_smoother *s)
 	/* Make sure we have enough data */
 	if (s->len < s->size) {
 		/* Or, if this is a G.729 frame with VAD on it, send it immediately anyway */
-		if (!((s->flags & AST_SMOOTHER_FLAG_G729) && (s->size % 10)))
+		if (!((s->flags & AST_SMOOTHER_FLAG_G729) && (s->len % 10)))
 			return NULL;
 	}
 	len = s->size;