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

1 files changed, 4 insertions, 5 deletions

diff --git a/src/libmpeg2/decode.c b/src/libmpeg2/decode.c
index 1064e6fed..0e84ccbaa 100644
--- a/src/libmpeg2/decode.c
+++ b/src/libmpeg2/decode.c
@@ -32,8 +32,7 @@
 #include "video_out.h"
 #include "mpeg2.h"
 #include "mpeg2_internal.h"
-#include "cpu_accel.h"
-#include "utils.h"
+#include "xineutils.h"
 
 #define BUFFER_SIZE (224 * 1024)
 
@@ -46,13 +45,13 @@ void mpeg2_init (mpeg2dec_t * mpeg2dec,
 
     if (do_init) {
 	do_init = 0;
-	config.flags = mm_accel();
+	config.flags = xine_mm_accel();
 	idct_init ();
 	motion_comp_init ();
     }
 
-    mpeg2dec->chunk_buffer = xmalloc_aligned (16, BUFFER_SIZE + 4);
-    mpeg2dec->picture = xmalloc_aligned (16, sizeof (picture_t));
+    mpeg2dec->chunk_buffer = xine_xmalloc_aligned (16, BUFFER_SIZE + 4);
+    mpeg2dec->picture = xine_xmalloc_aligned (16, sizeof (picture_t));
 
     mpeg2dec->shift = 0xffffff00;
     mpeg2dec->is_sequence_needed = 1;