diff options
| author | Max Khon <fjoe@FreeBSD.org> | 2005-03-09 19:45:06 +0000 |
|---|---|---|
| committer | Max Khon <fjoe@FreeBSD.org> | 2005-03-09 19:45:06 +0000 |
| commit | 134281eae51bcc2fc16c8ccca648ce4c995aae88 (patch) | |
| tree | 2eb27c89d3f145bdb6763d4d285fbbfdc73674c7 /net/asterisk/files | |
| parent | . Don't generate the .texi documentation files. They already exist in (diff) | |
Update to 1.0.6 and bristuff 0.2.0-RC7j.
Approved by: MAINTAINER
Sponsored by: LF.net
Notes
Notes:
svn path=/head/; revision=130751
Diffstat (limited to 'net/asterisk/files')
| -rw-r--r-- | net/asterisk/files/patch-formats::format_g729.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/net/asterisk/files/patch-formats::format_g729.c b/net/asterisk/files/patch-formats::format_g729.c index a144d1b0f6bf..78899a3e5d43 100644 --- a/net/asterisk/files/patch-formats::format_g729.c +++ b/net/asterisk/files/patch-formats::format_g729.c @@ -1,9 +1,6 @@ - -$FreeBSD$ - ---- formats/format_g729.c.orig Wed Jan 28 23:32:48 2004 -+++ formats/format_g729.c Thu Feb 19 01:03:30 2004 -@@ -45,7 +45,7 @@ +--- formats/format_g729.c.orig Mon Feb 7 10:29:19 2005 ++++ formats/format_g729.c Wed Mar 9 06:26:36 2005 +@@ -44,7 +44,7 @@ struct ast_frame fr; /* Frame information */ char waste[AST_FRIENDLY_OFFSET]; /* Buffer for sending frames, etc */ char empty; /* Empty character */ @@ -12,7 +9,7 @@ $FreeBSD$ }; -@@ -126,11 +126,11 @@ +@@ -125,11 +125,11 @@ s->fr.frametype = AST_FRAME_VOICE; s->fr.subclass = AST_FORMAT_G729A; s->fr.offset = AST_FRIENDLY_OFFSET; @@ -24,10 +21,10 @@ $FreeBSD$ s->fr.data = s->g729; - if ((res = read(s->fd, s->g729, 20)) != 20) { + if ((res = read(s->fd, s->g729, 10)) != 10) { - if (res) + if (res && (res != 10)) ast_log(LOG_WARNING, "Short read (%d) (%s)!\n", res, strerror(errno)); return NULL; -@@ -174,7 +174,7 @@ +@@ -173,7 +173,7 @@ cur = lseek(fs->fd, 0, SEEK_CUR); max = lseek(fs->fd, 0, SEEK_END); |