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/video_dec/libmpeg2new/libmpeg2/motion_comp_alpha.c | |
| 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/video_dec/libmpeg2new/libmpeg2/motion_comp_alpha.c')
| -rw-r--r-- | src/video_dec/libmpeg2new/libmpeg2/motion_comp_alpha.c | 6 |
1 files changed, 3 insertions, 3 deletions
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) { |