aboutsummaryrefslogtreecommitdiffstats
path: root/formats
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2006-04-13 17:46:06 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2006-04-13 17:46:06 +0000
commit2b4725d531ebb2c5a783c9bfb9f7fe98a50b3349 (patch)
tree9db8f0c48eb0ef12496b1d960865a3b7fbea6afd /formats
parentf56a09fbebf3d3f4f48c6f66a42363de53c75244 (diff)
Bug 6896 - Fix for garbled wav49 format
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@19814 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'formats')
-rw-r--r--formats/format_wav_gsm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/formats/format_wav_gsm.c b/formats/format_wav_gsm.c
index 3a1dfdfb3..9dbf30b53 100644
--- a/formats/format_wav_gsm.c
+++ b/formats/format_wav_gsm.c
@@ -226,7 +226,7 @@ static int update_header(FILE *f)
end = ftello(f);
/* in a gsm WAV, data starts 60 bytes in */
bytes = end - MSGSM_DATA_OFFSET;
- samples = bytes / GSM_FRAME_SIZE * MSGSM_SAMPLES;
+ samples = bytes / MSGSM_FRAME_SIZE * MSGSM_SAMPLES;
datalen = htoll((bytes + 1) & ~0x1);
filelen = htoll(MSGSM_DATA_OFFSET - 8 + ((bytes + 1) & ~0x1));
if (cur < 0) {
@@ -482,7 +482,7 @@ static int wav_write(struct ast_filestream *s, struct ast_frame *f)
} else { /* raw msgsm data */
src = f->data + len;
}
- if (src && (res = fwrite(src, 1, size, s->f)) != size) {
+ if (src && (res = fwrite(src, 1, MSGSM_FRAME_SIZE, s->f)) != MSGSM_FRAME_SIZE) {
ast_log(LOG_WARNING, "Bad write (%d/65): %s\n", res, strerror(errno));
return -1;
}