diff options
Diffstat (limited to 'libavcodec/ppc')
26 files changed, 42 insertions, 67 deletions
diff --git a/libavcodec/ppc/audiodsp.c b/libavcodec/ppc/audiodsp.c index 4ee3da4..2e37473 100644 --- a/libavcodec/ppc/audiodsp.c +++ b/libavcodec/ppc/audiodsp.c @@ -24,15 +24,12 @@ */ #include "config.h" -#if HAVE_ALTIVEC_H -#include <altivec.h> -#endif #include "libavutil/attributes.h" #include "libavutil/cpu.h" #include "libavutil/ppc/cpu.h" -#include "libavutil/ppc/types_altivec.h" #include "libavutil/ppc/util_altivec.h" + #include "libavcodec/audiodsp.h" #if HAVE_ALTIVEC diff --git a/libavcodec/ppc/blockdsp.c b/libavcodec/ppc/blockdsp.c index 45c492a..d89b77e 100644 --- a/libavcodec/ppc/blockdsp.c +++ b/libavcodec/ppc/blockdsp.c @@ -21,16 +21,15 @@ */ #include "config.h" -#if HAVE_ALTIVEC_H -#include <altivec.h> -#endif + #include <string.h> #include "libavutil/attributes.h" #include "libavutil/cpu.h" #include "libavutil/mem.h" #include "libavutil/ppc/cpu.h" -#include "libavutil/ppc/types_altivec.h" +#include "libavutil/ppc/util_altivec.h" + #include "libavcodec/blockdsp.h" /* ***** WARNING ***** WARNING ***** WARNING ***** */ diff --git a/libavcodec/ppc/fdctdsp.c b/libavcodec/ppc/fdctdsp.c index 6659046..4ab516c 100644 --- a/libavcodec/ppc/fdctdsp.c +++ b/libavcodec/ppc/fdctdsp.c @@ -19,14 +19,14 @@ */ #include "config.h" -#if HAVE_ALTIVEC_H -#include <altivec.h> -#endif #include "libavutil/attributes.h" #include "libavutil/cpu.h" #include "libavutil/ppc/cpu.h" +#include "libavutil/ppc/util_altivec.h" + #include "libavcodec/fdctdsp.h" + #include "fdct.h" #if HAVE_ALTIVEC diff --git a/libavcodec/ppc/fft_init.c b/libavcodec/ppc/fft_init.c index cbeaf98..57d7c80 100644 --- a/libavcodec/ppc/fft_init.c +++ b/libavcodec/ppc/fft_init.c @@ -23,7 +23,6 @@ #include "config.h" #include "libavutil/cpu.h" #include "libavutil/ppc/cpu.h" -#include "libavutil/ppc/types_altivec.h" #include "libavutil/ppc/util_altivec.h" #include "libavcodec/fft.h" diff --git a/libavcodec/ppc/fft_vsx.c b/libavcodec/ppc/fft_vsx.c index e92975f..c365fa1 100644 --- a/libavcodec/ppc/fft_vsx.c +++ b/libavcodec/ppc/fft_vsx.c @@ -25,7 +25,6 @@ #include "config.h" #include "libavutil/cpu.h" -#include "libavutil/ppc/types_altivec.h" #include "libavutil/ppc/util_altivec.h" #include "libavcodec/fft.h" #include "libavcodec/fft-internal.h" diff --git a/libavcodec/ppc/fft_vsx.h b/libavcodec/ppc/fft_vsx.h index a85475d..1e44031 100644 --- a/libavcodec/ppc/fft_vsx.h +++ b/libavcodec/ppc/fft_vsx.h @@ -27,7 +27,6 @@ #include "config.h" #include "libavutil/cpu.h" -#include "libavutil/ppc/types_altivec.h" #include "libavutil/ppc/util_altivec.h" #include "libavcodec/fft.h" #include "libavcodec/fft-internal.h" diff --git a/libavcodec/ppc/h264chroma_init.c b/libavcodec/ppc/h264chroma_init.c index 876efec..bd0d213 100644 --- a/libavcodec/ppc/h264chroma_init.c +++ b/libavcodec/ppc/h264chroma_init.c @@ -19,12 +19,13 @@ */ #include "config.h" + #include "libavutil/attributes.h" #include "libavutil/cpu.h" #include "libavutil/intreadwrite.h" #include "libavutil/ppc/cpu.h" -#include "libavutil/ppc/types_altivec.h" #include "libavutil/ppc/util_altivec.h" + #include "libavcodec/h264chroma.h" #if HAVE_ALTIVEC diff --git a/libavcodec/ppc/h264chroma_template.c b/libavcodec/ppc/h264chroma_template.c index d9b2a61..8f43e5d 100644 --- a/libavcodec/ppc/h264chroma_template.c +++ b/libavcodec/ppc/h264chroma_template.c @@ -19,7 +19,6 @@ */ #include "libavutil/mem.h" -#include "libavutil/ppc/types_altivec.h" #include "libavutil/ppc/util_altivec.h" /* this code assume that stride % 16 == 0 */ diff --git a/libavcodec/ppc/h264dsp.c b/libavcodec/ppc/h264dsp.c index 22a8d41..e84a058 100644 --- a/libavcodec/ppc/h264dsp.c +++ b/libavcodec/ppc/h264dsp.c @@ -28,7 +28,6 @@ #include "libavutil/intreadwrite.h" #include "libavutil/mem.h" #include "libavutil/ppc/cpu.h" -#include "libavutil/ppc/types_altivec.h" #include "libavutil/ppc/util_altivec.h" #include "libavcodec/h264dec.h" diff --git a/libavcodec/ppc/h264qpel.c b/libavcodec/ppc/h264qpel.c index 575f504..bef421f 100644 --- a/libavcodec/ppc/h264qpel.c +++ b/libavcodec/ppc/h264qpel.c @@ -19,13 +19,15 @@ */ #include "config.h" + #include "libavutil/attributes.h" #include "libavutil/cpu.h" #include "libavutil/intreadwrite.h" #include "libavutil/ppc/cpu.h" -#include "libavutil/ppc/types_altivec.h" #include "libavutil/ppc/util_altivec.h" + #include "libavcodec/h264qpel.h" + #include "hpeldsp_altivec.h" #if HAVE_ALTIVEC diff --git a/libavcodec/ppc/h264qpel_template.c b/libavcodec/ppc/h264qpel_template.c index 2f25e74..304604c 100644 --- a/libavcodec/ppc/h264qpel_template.c +++ b/libavcodec/ppc/h264qpel_template.c @@ -25,7 +25,6 @@ #include "libavutil/avassert.h" #include "libavutil/mem.h" -#include "libavutil/ppc/types_altivec.h" #include "libavutil/ppc/util_altivec.h" #define ASSERT_ALIGNED(ptr) av_assert2(!((uintptr_t)ptr&0x0000000F)); diff --git a/libavcodec/ppc/hevcdsp.c b/libavcodec/ppc/hevcdsp.c index 120362b..4b1037d 100644 --- a/libavcodec/ppc/hevcdsp.c +++ b/libavcodec/ppc/hevcdsp.c @@ -20,13 +20,10 @@ */ #include "config.h" -#if HAVE_ALTIVEC_H -#include <altivec.h> -#endif +#include "libavutil/attributes.h" #include "libavutil/cpu.h" #include "libavutil/ppc/cpu.h" -#include "libavutil/ppc/types_altivec.h" #include "libavutil/ppc/util_altivec.h" #include "libavcodec/hevcdsp.h" diff --git a/libavcodec/ppc/hpeldsp_altivec.c b/libavcodec/ppc/hpeldsp_altivec.c index 87a1f05..4f19521 100644 --- a/libavcodec/ppc/hpeldsp_altivec.c +++ b/libavcodec/ppc/hpeldsp_altivec.c @@ -22,16 +22,13 @@ #include "config.h" -#if HAVE_ALTIVEC_H -#include <altivec.h> -#endif - #include "libavutil/attributes.h" #include "libavutil/cpu.h" #include "libavutil/ppc/cpu.h" -#include "libavutil/ppc/types_altivec.h" #include "libavutil/ppc/util_altivec.h" + #include "libavcodec/hpeldsp.h" + #include "hpeldsp_altivec.h" #if HAVE_ALTIVEC diff --git a/libavcodec/ppc/idctdsp.c b/libavcodec/ppc/idctdsp.c index f1b4247..29f625a 100644 --- a/libavcodec/ppc/idctdsp.c +++ b/libavcodec/ppc/idctdsp.c @@ -30,17 +30,16 @@ * IDCT function itself was to factor out the partial transposition, and to * perform a full transpose at the end of the function. */ +#include "config.h" + #include <stdlib.h> #include <string.h> -#include "config.h" -#if HAVE_ALTIVEC_H -#include <altivec.h> -#endif #include "libavutil/attributes.h" #include "libavutil/cpu.h" #include "libavutil/ppc/cpu.h" -#include "libavutil/ppc/types_altivec.h" +#include "libavutil/ppc/util_altivec.h" + #include "libavcodec/idctdsp.h" #if HAVE_ALTIVEC diff --git a/libavcodec/ppc/lossless_audiodsp_altivec.c b/libavcodec/ppc/lossless_audiodsp_altivec.c index bdec252..298e6c3 100644 --- a/libavcodec/ppc/lossless_audiodsp_altivec.c +++ b/libavcodec/ppc/lossless_audiodsp_altivec.c @@ -19,14 +19,12 @@ */ #include "config.h" -#if HAVE_ALTIVEC_H -#include <altivec.h> -#endif #include "libavutil/attributes.h" #include "libavutil/cpu.h" #include "libavutil/ppc/cpu.h" -#include "libavutil/ppc/types_altivec.h" +#include "libavutil/ppc/util_altivec.h" + #include "libavcodec/lossless_audiodsp.h" #if HAVE_BIGENDIAN diff --git a/libavcodec/ppc/lossless_videodsp_altivec.c b/libavcodec/ppc/lossless_videodsp_altivec.c index 16dd99f..980f85b 100644 --- a/libavcodec/ppc/lossless_videodsp_altivec.c +++ b/libavcodec/ppc/lossless_videodsp_altivec.c @@ -21,15 +21,12 @@ */ #include "config.h" -#if HAVE_ALTIVEC_H -#include <altivec.h> -#endif #include "libavutil/attributes.h" #include "libavutil/cpu.h" #include "libavutil/ppc/cpu.h" -#include "libavutil/ppc/types_altivec.h" #include "libavutil/ppc/util_altivec.h" + #include "libavcodec/lossless_videodsp.h" #if HAVE_ALTIVEC diff --git a/libavcodec/ppc/me_cmp.c b/libavcodec/ppc/me_cmp.c index 9f75ed2..17f9a4f 100644 --- a/libavcodec/ppc/me_cmp.c +++ b/libavcodec/ppc/me_cmp.c @@ -21,15 +21,12 @@ */ #include "config.h" -#if HAVE_ALTIVEC_H -#include <altivec.h> -#endif #include "libavutil/attributes.h" #include "libavutil/cpu.h" #include "libavutil/ppc/cpu.h" -#include "libavutil/ppc/types_altivec.h" #include "libavutil/ppc/util_altivec.h" + #include "libavcodec/avcodec.h" #include "libavcodec/mpegvideo.h" #include "libavcodec/me_cmp.h" diff --git a/libavcodec/ppc/mpegvideo_altivec.c b/libavcodec/ppc/mpegvideo_altivec.c index 1b6bda6..2c6ff91 100644 --- a/libavcodec/ppc/mpegvideo_altivec.c +++ b/libavcodec/ppc/mpegvideo_altivec.c @@ -25,11 +25,12 @@ #include <stdio.h> #include "config.h" + #include "libavutil/attributes.h" #include "libavutil/cpu.h" #include "libavutil/ppc/cpu.h" -#include "libavutil/ppc/types_altivec.h" #include "libavutil/ppc/util_altivec.h" + #include "libavcodec/mpegvideo.h" #if HAVE_ALTIVEC diff --git a/libavcodec/ppc/mpegvideodsp.c b/libavcodec/ppc/mpegvideodsp.c index 0219332..990a974 100644 --- a/libavcodec/ppc/mpegvideodsp.c +++ b/libavcodec/ppc/mpegvideodsp.c @@ -23,8 +23,8 @@ #include "libavutil/cpu.h" #include "libavutil/mem.h" #include "libavutil/ppc/cpu.h" -#include "libavutil/ppc/types_altivec.h" #include "libavutil/ppc/util_altivec.h" + #include "libavcodec/mpegvideodsp.h" #if HAVE_ALTIVEC diff --git a/libavcodec/ppc/mpegvideoencdsp.c b/libavcodec/ppc/mpegvideoencdsp.c index 3e6765c..b96487b 100644 --- a/libavcodec/ppc/mpegvideoencdsp.c +++ b/libavcodec/ppc/mpegvideoencdsp.c @@ -17,16 +17,14 @@ */ #include "config.h" + #include <stdint.h> -#if HAVE_ALTIVEC_H -#include <altivec.h> -#endif #include "libavutil/attributes.h" #include "libavutil/cpu.h" #include "libavutil/ppc/cpu.h" -#include "libavutil/ppc/types_altivec.h" #include "libavutil/ppc/util_altivec.h" + #include "libavcodec/mpegvideoencdsp.h" #if HAVE_ALTIVEC diff --git a/libavcodec/ppc/pixblockdsp.c b/libavcodec/ppc/pixblockdsp.c index f5ac850..01d14b4 100644 --- a/libavcodec/ppc/pixblockdsp.c +++ b/libavcodec/ppc/pixblockdsp.c @@ -21,15 +21,12 @@ */ #include "config.h" -#if HAVE_ALTIVEC_H -#include <altivec.h> -#endif #include "libavutil/attributes.h" #include "libavutil/cpu.h" #include "libavutil/ppc/cpu.h" -#include "libavutil/ppc/types_altivec.h" #include "libavutil/ppc/util_altivec.h" + #include "libavcodec/avcodec.h" #include "libavcodec/pixblockdsp.h" diff --git a/libavcodec/ppc/svq1enc_altivec.c b/libavcodec/ppc/svq1enc_altivec.c index 4e25e25..f63f086 100644 --- a/libavcodec/ppc/svq1enc_altivec.c +++ b/libavcodec/ppc/svq1enc_altivec.c @@ -18,18 +18,15 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <stdint.h> - #include "config.h" -#if HAVE_ALTIVEC_H -#include <altivec.h> -#endif + +#include <stdint.h> #include "libavutil/attributes.h" #include "libavutil/cpu.h" #include "libavutil/ppc/cpu.h" -#include "libavutil/ppc/types_altivec.h" #include "libavutil/ppc/util_altivec.h" + #include "libavcodec/svq1enc.h" #if HAVE_ALTIVEC diff --git a/libavcodec/ppc/vc1dsp_altivec.c b/libavcodec/ppc/vc1dsp_altivec.c index 83d537f..bbadb2a 100644 --- a/libavcodec/ppc/vc1dsp_altivec.c +++ b/libavcodec/ppc/vc1dsp_altivec.c @@ -20,11 +20,12 @@ */ #include "config.h" + #include "libavutil/attributes.h" #include "libavutil/cpu.h" #include "libavutil/ppc/cpu.h" -#include "libavutil/ppc/types_altivec.h" #include "libavutil/ppc/util_altivec.h" + #include "libavcodec/vc1dsp.h" #if HAVE_ALTIVEC diff --git a/libavcodec/ppc/vorbisdsp_altivec.c b/libavcodec/ppc/vorbisdsp_altivec.c index d7557c8..4dabf2d 100644 --- a/libavcodec/ppc/vorbisdsp_altivec.c +++ b/libavcodec/ppc/vorbisdsp_altivec.c @@ -19,12 +19,12 @@ */ #include "config.h" -#if HAVE_ALTIVEC_H -#include <altivec.h> -#endif + #include "libavutil/attributes.h" #include "libavutil/cpu.h" #include "libavutil/ppc/cpu.h" +#include "libavutil/ppc/util_altivec.h" + #include "libavcodec/vorbisdsp.h" #if HAVE_ALTIVEC diff --git a/libavcodec/ppc/vp3dsp_altivec.c b/libavcodec/ppc/vp3dsp_altivec.c index d2231d0..a9a48d1 100644 --- a/libavcodec/ppc/vp3dsp_altivec.c +++ b/libavcodec/ppc/vp3dsp_altivec.c @@ -21,11 +21,12 @@ #include <string.h> #include "config.h" + #include "libavutil/attributes.h" #include "libavutil/cpu.h" #include "libavutil/ppc/cpu.h" -#include "libavutil/ppc/types_altivec.h" #include "libavutil/ppc/util_altivec.h" + #include "libavcodec/vp3dsp.h" #if HAVE_ALTIVEC diff --git a/libavcodec/ppc/vp8dsp_altivec.c b/libavcodec/ppc/vp8dsp_altivec.c index 23e4ace..31201ed 100644 --- a/libavcodec/ppc/vp8dsp_altivec.c +++ b/libavcodec/ppc/vp8dsp_altivec.c @@ -21,12 +21,14 @@ */ #include "config.h" + #include "libavutil/cpu.h" #include "libavutil/mem.h" #include "libavutil/ppc/cpu.h" -#include "libavutil/ppc/types_altivec.h" #include "libavutil/ppc/util_altivec.h" + #include "libavcodec/vp8dsp.h" + #include "hpeldsp_altivec.h" #if HAVE_ALTIVEC |
