Version 0.1.7 from FTP

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@251 f38db490-d61c-443f-a65b-d21fe96a405b

2 files changed, 11 insertions, 3 deletions

diff --git a/formats/Makefile b/formats/Makefile
index f981e8de2..f38101f3c 100755
--- a/formats/Makefile
+++ b/formats/Makefile
@@ -11,7 +11,7 @@
 # the GNU General Public License
 #
 
-FORMAT_LIBS=format_g723.so format_wav.so format_mp3.so format_wav_gsm.so format_gsm.so
+FORMAT_LIBS=format_g723.so format_wav.so format_mp3.so format_wav_gsm.so format_gsm.so format_vox.so
 
 GSMLIB=../codecs/gsm/lib/libgsm.a
 
@@ -28,5 +28,8 @@ clean:
 format_wav.so : format_wav.o
 	$(CC) -shared -Xlinker -x -o $@ $< -laudiofile
 
+format_mp3.so : format_mp3.o
+	$(CC) -shared -Xlinker -x -o $@ $< -lm
+
 install: all
 	for x in $(FORMAT_LIBS); do $(INSTALL) -m 755 $$x $(MODULES_DIR) ; done
diff --git a/formats/format_gsm.c b/formats/format_gsm.c
index 6a06627fb..0906a948f 100755
--- a/formats/format_gsm.c
+++ b/formats/format_gsm.c
@@ -230,8 +230,8 @@ static int gsm_write(struct ast_filestream *fs, struct ast_frame *f)
 		ast_log(LOG_WARNING, "Asked to write non-GSM frame (%d)!\n", f->subclass);
 		return -1;
 	}
-	if (f->datalen != 33) {
-		ast_log(LOG_WARNING, "Invalid data length, %d, should be 33\n", f->datalen);
+	if (f->datalen % 33) {
+		ast_log(LOG_WARNING, "Invalid data length, %d, should be multiple of 33\n", f->datalen);
 		return -1;
 	}
 	if ((res = write(fs->fd, f->data, f->datalen)) != f->datalen) {
@@ -296,3 +296,8 @@ char *description()
 	return desc;
 }
 
+
+char *key()
+{
+	return ASTERISK_GPL_KEY;
+}