From 5cb036aff44c2ff274ec38b28382245c5f695689 Mon Sep 17 00:00:00 2001 From: Rocky Bernstein Date: Thu, 19 Feb 2004 02:50:24 +0000 Subject: Mandrake patches from http://cvs.mandrakesoft.com/cgi-bin/cvsweb.cgi/SPECS/xine-lib/ via Goetz Waschk who reports: The amd64 patch (xine-lib-1-rc0a-amd64.patch) sets some conservative CFLAGS for amd64, the lib64 patch (xine-lib-1-rc0a-lib64.patch) replaces hardcoded /lib to support the lib64 library dir on amd64, the directfb patch (xine-lib-1-rc2-no-directfb.patch) adds a configure option to disable directfb, the linuxfb patch (xine-lib-1-rc3a-no-linuxfb.patch) does the same for linux framebuffer and the 64bit fixes patch (xine-lib-1-rc3-64bit-fixes.patch) doesn't apply at the moment against the CVS -- demux_ogg.c was not applied. it includes some 64 bit pointer and other fixes for 64bit architectures. from Gwenole Beauchesne I haven't tested other than apply and compile. CVS patchset: 6174 CVS date: 2004/02/19 02:50:24 --- src/demuxers/demux_mng.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/demuxers') diff --git a/src/demuxers/demux_mng.c b/src/demuxers/demux_mng.c index 2c6946692..22617cf00 100644 --- a/src/demuxers/demux_mng.c +++ b/src/demuxers/demux_mng.c @@ -19,7 +19,7 @@ */ /* - * $Id: demux_mng.c,v 1.20 2004/01/12 17:35:15 miguelfreitas Exp $ + * $Id: demux_mng.c,v 1.21 2004/02/19 02:50:25 rockyb Exp $ * * demux_mng.c, Demuxer plugin for Multiple-image Network Graphics format * @@ -73,11 +73,11 @@ typedef struct { demux_class_t demux_class; } demux_mng_class_t; -static mng_ptr mymng_alloc(mng_uint32 size){ +static mng_ptr mymng_alloc(mng_size_t size){ return (mng_ptr)calloc(1, size); } -static void mymng_free(mng_ptr p, mng_uint32 size){ +static void mymng_free(mng_ptr p, mng_size_t size){ free(p); } -- cgit v1.2.3