This commit was manufactured by cvs2svn to create tag 'RELEASE_4_11_0'.release/4.11.0

1 files changed, 0 insertions, 47 deletions

diff --git a/net/asterisk-devel/files/patch-formats::format_g729.c b/net/asterisk-devel/files/patch-formats::format_g729.c
deleted file mode 100644
index a144d1b0f6bf..000000000000
--- a/net/asterisk-devel/files/patch-formats::format_g729.c
+++ /dev/null
@@ -1,47 +0,0 @@
-
-$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 @@
- 	struct ast_frame fr;				/* Frame information */
- 	char waste[AST_FRIENDLY_OFFSET];	/* Buffer for sending frames, etc */
- 	char empty;							/* Empty character */
--	unsigned char g729[20];				/* Two Real G729 Frames */
-+	unsigned char g729[10];				/* One Real G729 Frame */
- };
- 
- 
-@@ -126,11 +126,11 @@
- 	s->fr.frametype = AST_FRAME_VOICE;
- 	s->fr.subclass = AST_FORMAT_G729A;
- 	s->fr.offset = AST_FRIENDLY_OFFSET;
--	s->fr.samples = 160;
--	s->fr.datalen = 20;
-+	s->fr.samples = 80;
-+	s->fr.datalen = 10;
- 	s->fr.mallocd = 0;
- 	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)
- 			ast_log(LOG_WARNING, "Short read (%d) (%s)!\n", res, strerror(errno));
- 		return NULL;
-@@ -174,7 +174,7 @@
- 	cur = lseek(fs->fd, 0, SEEK_CUR);
- 	max = lseek(fs->fd, 0, SEEK_END);
- 	
--	bytes = 20 * (sample_offset / 160);
-+	bytes = 10 * (sample_offset / 80);
- 	if (whence == SEEK_SET)
- 		offset = bytes;
- 	else if (whence == SEEK_CUR || whence == SEEK_FORCECUR)
-@@ -202,7 +202,7 @@
- {
- 	off_t offset;
- 	offset = lseek(fs->fd, 0, SEEK_CUR);
--	return (offset/20)*160;
-+	return (offset/10)*80;
- }
- 
- int load_module()