From bacac99192b65faed1a0047a8be5b95abf15873d Mon Sep 17 00:00:00 2001 From: Daniel Caujolle-Bert Date: Sat, 17 Nov 2001 14:26:36 +0000 Subject: Add 'xine_' prefix to all of xine-utils functions (what about cpu acceleration?). Merge xine-utils header files to a new one "xineutils.h". Update xine-lib C/headers to reflect those changes. dxr3 headers are no more installed ine $includdir, but $includdir/xine. CVS patchset: 1054 CVS date: 2001/11/17 14:26:36 --- src/demuxers/demux_pes.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/demuxers/demux_pes.c') diff --git a/src/demuxers/demux_pes.c b/src/demuxers/demux_pes.c index 77defa9a7..4b4e728b5 100644 --- a/src/demuxers/demux_pes.c +++ b/src/demuxers/demux_pes.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_pes.c,v 1.12 2001/11/10 13:48:02 guenter Exp $ + * $Id: demux_pes.c,v 1.13 2001/11/17 14:26:37 f1rmb Exp $ * * demultiplexer for mpeg 2 PES (Packetized Elementary Streams) * reads streams of variable blocksizes @@ -37,10 +37,9 @@ #include #include -#include "monitor.h" #include "xine_internal.h" #include "demux.h" -#include "utils.h" +#include "xineutils.h" #define NUM_PREVIEW_BUFFERS 400 @@ -577,7 +576,7 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) { return NULL; } - this = xmalloc (sizeof (demux_pes_t)); + this = xine_xmalloc (sizeof (demux_pes_t)); config = xine->config; xine_debug = config->lookup_int (config, "xine_debug", 0); -- cgit v1.2.3