diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2009-03-06 14:00:57 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2009-03-06 14:00:57 +0000 |
| commit | d8a50c1e20367be95911533c62637c23b809b916 (patch) | |
| tree | 4a01fcbfbc22074dec1bba2c852bb7b8bb35b8fb /src | |
| parent | d031764edb6050623f0e399be5a7cbc7bee76249 (diff) | |
| parent | 2f7f1de18284485c956483555d19bc9167bf36ad (diff) | |
| download | xine-lib-d8a50c1e20367be95911533c62637c23b809b916.tar.gz xine-lib-d8a50c1e20367be95911533c62637c23b809b916.tar.bz2 | |
Merge from 1.1.
--HG--
rename : src/libmpeg2new/include/attributes.h => src/video_dec/libmpeg2new/include/attributes.h
rename : src/libmpeg2new/libmpeg2/motion_comp_alpha.c => src/video_dec/libmpeg2new/libmpeg2/motion_comp_alpha.c
rename : src/libmpeg2new/libmpeg2/motion_comp_altivec.c => src/video_dec/libmpeg2new/libmpeg2/motion_comp_altivec.c
rename : src/libmpeg2new/libmpeg2/motion_comp_vis.c => src/video_dec/libmpeg2new/libmpeg2/motion_comp_vis.c
Diffstat (limited to 'src')
4 files changed, 9 insertions, 13 deletions
diff --git a/src/video_dec/libmpeg2new/include/attributes.h b/src/video_dec/libmpeg2new/include/attributes.h index eefbc0dd1..83f1364a2 100644 --- a/src/video_dec/libmpeg2new/include/attributes.h +++ b/src/video_dec/libmpeg2new/include/attributes.h @@ -22,11 +22,7 @@ */ /* use gcc attribs to align critical data structures */ -#ifdef ATTRIBUTE_ALIGNED_MAX -#define ATTR_ALIGN(align) __attribute__ ((__aligned__ ((ATTRIBUTE_ALIGNED_MAX < align) ? ATTRIBUTE_ALIGNED_MAX : align))) -#else -#define ATTR_ALIGN(align) -#endif +#include <xine/attributes.h> #ifdef HAVE_BUILTIN_EXPECT #define likely(x) __builtin_expect ((x) != 0, 1) diff --git a/src/video_dec/libmpeg2new/libmpeg2/motion_comp_alpha.c b/src/video_dec/libmpeg2new/libmpeg2/motion_comp_alpha.c index 1b3712a1a..73f6625d2 100644 --- a/src/video_dec/libmpeg2new/libmpeg2/motion_comp_alpha.c +++ b/src/video_dec/libmpeg2new/libmpeg2/motion_comp_alpha.c @@ -26,10 +26,10 @@ #include <inttypes.h> -#include "mpeg2.h" -#include <xine/attributes.h> +#include "../include/mpeg2.h" +#include "../include/attributes.h" #include "mpeg2_internal.h" -#include "alpha_asm.h" +#include "../include/alpha_asm.h" static inline uint64_t avg2 (uint64_t a, uint64_t b) { diff --git a/src/video_dec/libmpeg2new/libmpeg2/motion_comp_altivec.c b/src/video_dec/libmpeg2new/libmpeg2/motion_comp_altivec.c index ee740e14e..cc1b72f56 100644 --- a/src/video_dec/libmpeg2new/libmpeg2/motion_comp_altivec.c +++ b/src/video_dec/libmpeg2new/libmpeg2/motion_comp_altivec.c @@ -30,8 +30,8 @@ #endif #include <inttypes.h> -#include "mpeg2.h" -#include <xine/attributes.h> +#include "../include/mpeg2.h" +#include "../include/attributes.h" #include "mpeg2_internal.h" typedef vector signed char vector_s8_t; diff --git a/src/video_dec/libmpeg2new/libmpeg2/motion_comp_vis.c b/src/video_dec/libmpeg2new/libmpeg2/motion_comp_vis.c index f4e1724bf..e4b61aaa7 100644 --- a/src/video_dec/libmpeg2new/libmpeg2/motion_comp_vis.c +++ b/src/video_dec/libmpeg2new/libmpeg2/motion_comp_vis.c @@ -26,10 +26,10 @@ #include <inttypes.h> -#include "mpeg2.h" -#include <xine/attributes.h> +#include "../include/mpeg2.h" +#include "../include/attributes.h" #include "mpeg2_internal.h" -#include "vis.h" +#include "../include/vis.h" /* The trick used in some of this file is the formula from the MMX * motion comp code, which is: |