Index: formats/format_mp3.c
===================================================================
--- formats/format_mp3.c	(revision 599)
+++ formats/format_mp3.c	(working copy)
@@ -97,7 +97,7 @@
 	
 	InitMP3(&p->mp, OUTSCALE);
 	p->dbuflen = 0;
-	s->fr.data = s->buf;
+	s->fr.data.ptr = s->buf;
 	s->fr.frametype = AST_FRAME_VOICE;
 	s->fr.subclass = AST_FORMAT_SLINEAR;
 	/* datalen will vary for each frame */
@@ -232,7 +232,7 @@
 	s->fr.subclass = AST_FORMAT_SLINEAR;
 	s->fr.offset = AST_FRIENDLY_OFFSET;
 	s->fr.datalen = p->buflen;
-	s->fr.data = s->buf;
+	s->fr.data.ptr = s->buf;
 	s->fr.mallocd = 0;
 	s->fr.samples = delay;
 	*whennext = delay;