aboutsummaryrefslogtreecommitdiffstats
path: root/formats
diff options
context:
space:
mode:
authorqwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b>2008-05-22 17:10:53 +0000
committerqwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b>2008-05-22 17:10:53 +0000
commitdac7a3528e6f5436b32dd372eb5c31c5b5b1f4be (patch)
tree9a258decae4f074f9e9a7bfe05180c78af99aca4 /formats
parent9ae780c750855c4aeadf55a66e2e091e3a928c01 (diff)
Fix a few places where frame data was used directly.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@117828 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'formats')
-rw-r--r--formats/format_ogg_vorbis.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/formats/format_ogg_vorbis.c b/formats/format_ogg_vorbis.c
index 669e96a7d..de2a20c74 100644
--- a/formats/format_ogg_vorbis.c
+++ b/formats/format_ogg_vorbis.c
@@ -291,7 +291,7 @@ static int ogg_vorbis_write(struct ast_filestream *fs, struct ast_frame *f)
if (!f->datalen)
return -1;
- data = (short *) f->data;
+ data = (short *) f->data.ptr;
buffer = vorbis_analysis_buffer(&s->vd, f->samples);
@@ -433,7 +433,7 @@ static struct ast_frame *ogg_vorbis_read(struct ast_filestream *fs,
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 */
+ buf = (short *)(fs->fr.data.ptr); /* SLIN data buffer */
while (samples_out != SAMPLES_MAX) {
float **pcm;