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

5 files changed, 8 insertions, 8 deletions

diff --git a/src/libffmpeg/libavcodec/dsputil.c b/src/libffmpeg/libavcodec/dsputil.c
index c29574303..e68833b7c 100644
--- a/src/libffmpeg/libavcodec/dsputil.c
+++ b/src/libffmpeg/libavcodec/dsputil.c
@@ -20,7 +20,7 @@
 #include <stdio.h>
 #include "avcodec.h"
 #include "dsputil.h"
-#include "cpu_accel.h"
+#include "xineutils.h"
 
 void (*ff_idct)(DCTELEM *block);
 void (*get_pixels)(DCTELEM *block, const UINT8 *pixels, int line_size);
@@ -415,7 +415,7 @@ void dsputil_init(void)
 {
     int i, j;
 #ifdef ARCH_X86
-    uint32_t mm = mm_accel();
+    uint32_t mm = xine_mm_accel();
 #endif
     int use_permuted_mmx_idct;
     int accel_dsputil;
diff --git a/src/libffmpeg/libavcodec/dsputil.h b/src/libffmpeg/libavcodec/dsputil.h
index f5e22e4c4..e401065a0 100644
--- a/src/libffmpeg/libavcodec/dsputil.h
+++ b/src/libffmpeg/libavcodec/dsputil.h
@@ -76,7 +76,7 @@ void block_permute(INT16 *block);
 
 #if defined(ARCH_X86)
 
-#include "cpu_accel.h"
+#include "xineutils.h"
 
 extern int mm_flags;
 
diff --git a/src/libffmpeg/libavcodec/dsputil_mmx.c b/src/libffmpeg/libavcodec/dsputil_mmx.c
index 44b0b23d2..b806c34e5 100644
--- a/src/libffmpeg/libavcodec/dsputil_mmx.c
+++ b/src/libffmpeg/libavcodec/dsputil_mmx.c
@@ -20,7 +20,7 @@
  */
 
 #include "dsputil.h"
-#include "cpu_accel.h"
+#include "xineutils.h"
 
 int mm_flags; /* multimedia extension flags */
 
@@ -967,7 +967,7 @@ static void   sub_pixels_xy2_mmx( DCTELEM  *block, const UINT8 *pixels, int line
 
 void dsputil_init_mmx(void)
 {
-    mm_flags = mm_accel();
+    mm_flags = xine_mm_accel();
 #if 0
     printf("CPU flags:");
     if (mm_flags & MM_MMX)
diff --git a/src/libffmpeg/libavcodec/idct_mmx.c b/src/libffmpeg/libavcodec/idct_mmx.c
index 3c1a401e3..88fd3b806 100644
--- a/src/libffmpeg/libavcodec/idct_mmx.c
+++ b/src/libffmpeg/libavcodec/idct_mmx.c
@@ -26,7 +26,7 @@
 
 #include "../config.h"
 
-#include "cpu_accel.h"
+#include "xineutils.h"
 
 #ifdef ATTR_ALIGN
 #undef ATTR_ALIGN
diff --git a/src/libffmpeg/libavcodec/mpegvideo_mmx.c b/src/libffmpeg/libavcodec/mpegvideo_mmx.c
index 279e5ec22..7b3ba8aff 100644
--- a/src/libffmpeg/libavcodec/mpegvideo_mmx.c
+++ b/src/libffmpeg/libavcodec/mpegvideo_mmx.c
@@ -21,7 +21,7 @@
 
 #include "dsputil.h"
 #include "mpegvideo.h"
-#include "cpu_accel.h"
+#include "xineutils.h"
 
 #if 0
 
@@ -222,7 +222,7 @@ void MPV_common_init_mmx(MpegEncContext *s)
 {
     int mm_flags;
 
-    mm_flags = mm_accel();
+    mm_flags = xine_mm_accel();
 
     if (mm_flags & MM_ACCEL_X86_MMX) {
         /* XXX: should include h263 optimization too. It would go even