aboutsummaryrefslogtreecommitdiffstats
path: root/formats
diff options
context:
space:
mode:
authormurf <murf@f38db490-d61c-443f-a65b-d21fe96a405b>2006-09-25 14:52:28 +0000
committermurf <murf@f38db490-d61c-443f-a65b-d21fe96a405b>2006-09-25 14:52:28 +0000
commitf3fd9b073ff3989ce2639b57182cc568749d13a9 (patch)
treeac564ab6db02962ed459ca7c5bc2db31ad70b567 /formats
parentb2750d7938a27a1ebcaf2be3c8b85d4a844eb978 (diff)
This tiny fix prevents asterisk from crashing if trying to play an OGG moh file.
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@43605 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'formats')
-rw-r--r--formats/format_ogg_vorbis.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/formats/format_ogg_vorbis.c b/formats/format_ogg_vorbis.c
index d1122924a..5fc17c338 100644
--- a/formats/format_ogg_vorbis.c
+++ b/formats/format_ogg_vorbis.c
@@ -440,12 +440,13 @@ static struct ast_frame *ogg_vorbis_read(struct ast_filestream *fs,
int samples_in;
int samples_out = 0;
struct vorbis_desc *s = (struct vorbis_desc *)fs->private;
- short *buf = (short *)(fs->fr.data); /* SLIN data buffer */
+ short *buf; /* SLIN data buffer */
fs->fr.frametype = AST_FRAME_VOICE;
fs->fr.subclass = AST_FORMAT_SLINEAR;
fs->fr.mallocd = 0;
AST_FRAME_SET_BUFFER(&fs->fr, fs->buf, AST_FRIENDLY_OFFSET, BUF_SIZE);
+ buf = (short *)(fs->fr.data); /* SLIN data buffer */
while (samples_out != SAMPLES_MAX) {
float **pcm;