diff options
| author | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2001-11-17 14:26:36 +0000 |
|---|---|---|
| committer | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2001-11-17 14:26:36 +0000 |
| commit | bacac99192b65faed1a0047a8be5b95abf15873d (patch) | |
| tree | c1ca0949f9cb222c8ef6305d8150ca4d9e85b4a7 /src/libmpeg2 | |
| parent | 75a1024fb27dbff9c4bfc948392910af94797683 (diff) | |
| download | xine-lib-bacac99192b65faed1a0047a8be5b95abf15873d.tar.gz xine-lib-bacac99192b65faed1a0047a8be5b95abf15873d.tar.bz2 | |
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
Diffstat (limited to 'src/libmpeg2')
| -rw-r--r-- | src/libmpeg2/decode.c | 9 | ||||
| -rw-r--r-- | src/libmpeg2/idct.c | 2 | ||||
| -rw-r--r-- | src/libmpeg2/idct_mmx.c | 3 | ||||
| -rw-r--r-- | src/libmpeg2/motion_comp.c | 2 | ||||
| -rw-r--r-- | src/libmpeg2/motion_comp_mmx.c | 3 |
5 files changed, 8 insertions, 11 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; diff --git a/src/libmpeg2/idct.c b/src/libmpeg2/idct.c index 757d2c5e3..2aaf6eaf9 100644 --- a/src/libmpeg2/idct.c +++ b/src/libmpeg2/idct.c @@ -43,7 +43,7 @@ #include <inttypes.h> #include "mpeg2_internal.h" -#include "cpu_accel.h" +#include "xineutils.h" #define W1 2841 /* 2048*sqrt (2)*cos (1*pi/16) */ #define W2 2676 /* 2048*sqrt (2)*cos (2*pi/16) */ diff --git a/src/libmpeg2/idct_mmx.c b/src/libmpeg2/idct_mmx.c index 927a78996..8741d838e 100644 --- a/src/libmpeg2/idct_mmx.c +++ b/src/libmpeg2/idct_mmx.c @@ -26,8 +26,7 @@ #include <inttypes.h> #include "mpeg2_internal.h" -#include "attributes.h" -#include "cpu_accel.h" +#include "xineutils.h" #define ROW_SHIFT 11 #define COL_SHIFT 6 diff --git a/src/libmpeg2/motion_comp.c b/src/libmpeg2/motion_comp.c index fd4055265..b8f308525 100644 --- a/src/libmpeg2/motion_comp.c +++ b/src/libmpeg2/motion_comp.c @@ -25,7 +25,7 @@ #include <inttypes.h> #include "mpeg2_internal.h" -#include "cpu_accel.h" +#include "xineutils.h" mc_functions_t mc_functions; diff --git a/src/libmpeg2/motion_comp_mmx.c b/src/libmpeg2/motion_comp_mmx.c index 049546b1f..29bd78cbf 100644 --- a/src/libmpeg2/motion_comp_mmx.c +++ b/src/libmpeg2/motion_comp_mmx.c @@ -26,8 +26,7 @@ #include <inttypes.h> #include "mpeg2_internal.h" -#include "attributes.h" -#include "cpu_accel.h" +#include "xineutils.h" #define CPU_MMXEXT 0 #define CPU_3DNOW 1 |