summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/demuxers/demux_mpeg_block.c4
-rw-r--r--src/liba52/parse.c3
2 files changed, 4 insertions, 3 deletions
diff --git a/src/demuxers/demux_mpeg_block.c b/src/demuxers/demux_mpeg_block.c
index 5c1378f1f..90b58bead 100644
--- a/src/demuxers/demux_mpeg_block.c
+++ b/src/demuxers/demux_mpeg_block.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: demux_mpeg_block.c,v 1.82 2002/03/24 14:15:36 guenter Exp $
+ * $Id: demux_mpeg_block.c,v 1.83 2002/03/24 19:23:47 jcdutton Exp $
*
* demultiplexer for mpeg 1/2 program streams
*
@@ -1133,7 +1133,7 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) {
this->demux_plugin.get_stream_length = demux_mpeg_block_get_stream_length;
this->demux_plugin.get_mimetypes = demux_mpeg_block_get_mimetypes;
- this->scratch = xine_xmalloc_aligned (512, 4096, &this->scratch_base);
+ this->scratch = xine_xmalloc_aligned (512, 4096, (void**) &this->scratch_base);
return (demux_plugin_t *) this;
}
diff --git a/src/liba52/parse.c b/src/liba52/parse.c
index 3e5f99256..e2be25d12 100644
--- a/src/liba52/parse.c
+++ b/src/liba52/parse.c
@@ -22,6 +22,7 @@
#include "config.h"
#include <inttypes.h>
+#include <stdio.h> /* For printf */
#include <stdlib.h>
#include <string.h>
@@ -48,7 +49,7 @@ sample_t * a52_init (uint32_t mm_accel, sample_t **samples_base)
imdct_init (mm_accel);
samples = xine_xmalloc_aligned (16, 256 * 12 * sizeof (sample_t),
- samples_base);
+ (void**) samples_base);
if (samples == NULL) {
printf ("liba52: samples malloc failed!\n");