diff options
| -rw-r--r-- | libavcodec/fft.h | 4 | ||||
| -rw-r--r-- | libavcodec/ppc/h264chroma_init.c | 5 | ||||
| -rw-r--r-- | libavcodec/ppc/h264qpel.c | 6 | ||||
| -rw-r--r-- | libavcodec/ppc/hpeldsp_altivec.c | 9 | ||||
| -rw-r--r-- | libavcodec/ppc/vp3dsp_altivec.c | 7 |
5 files changed, 14 insertions, 17 deletions
diff --git a/libavcodec/fft.h b/libavcodec/fft.h index 9d92b2c2d2..fc17d66ac0 100644 --- a/libavcodec/fft.h +++ b/libavcodec/fft.h @@ -133,14 +133,12 @@ void ff_init_ff_cos_tabs(int index); */ int ff_fft_init(FFTContext *s, int nbits, int inverse); -#if CONFIG_FFT_FLOAT void ff_fft_init_altivec(FFTContext *s); void ff_fft_init_x86(FFTContext *s); void ff_fft_init_arm(FFTContext *s); void ff_fft_init_mips(FFTContext *s); -#else + void ff_fft_fixed_init_arm(FFTContext *s); -#endif void ff_fft_end(FFTContext *s); diff --git a/libavcodec/ppc/h264chroma_init.c b/libavcodec/ppc/h264chroma_init.c index f9e2a76cca..82385cc49e 100644 --- a/libavcodec/ppc/h264chroma_init.c +++ b/libavcodec/ppc/h264chroma_init.c @@ -20,15 +20,14 @@ #include "config.h" #include "libavutil/attributes.h" -#include "libavcodec/h264chroma.h" - -#if HAVE_ALTIVEC #include "libavutil/cpu.h" #include "libavutil/intreadwrite.h" #include "libavutil/ppc/types_altivec.h" #include "libavutil/ppc/util_altivec.h" +#include "libavcodec/h264chroma.h" #include "dsputil_altivec.h" +#if HAVE_ALTIVEC #define PUT_OP_U8_ALTIVEC(d, s, dst) d = s #define AVG_OP_U8_ALTIVEC(d, s, dst) d = vec_avg(dst, s) diff --git a/libavcodec/ppc/h264qpel.c b/libavcodec/ppc/h264qpel.c index 6747fb3020..bda7b18b30 100644 --- a/libavcodec/ppc/h264qpel.c +++ b/libavcodec/ppc/h264qpel.c @@ -20,15 +20,15 @@ #include "config.h" #include "libavutil/attributes.h" -#include "libavcodec/h264qpel.h" - -#if HAVE_ALTIVEC #include "libavutil/cpu.h" #include "libavutil/intreadwrite.h" #include "libavutil/ppc/types_altivec.h" #include "libavutil/ppc/util_altivec.h" +#include "libavcodec/h264qpel.h" #include "dsputil_altivec.h" +#if HAVE_ALTIVEC + #define PUT_OP_U8_ALTIVEC(d, s, dst) d = s #define AVG_OP_U8_ALTIVEC(d, s, dst) d = vec_avg(dst, s) diff --git a/libavcodec/ppc/hpeldsp_altivec.c b/libavcodec/ppc/hpeldsp_altivec.c index 5bc812a0b8..19e2aa111c 100644 --- a/libavcodec/ppc/hpeldsp_altivec.c +++ b/libavcodec/ppc/hpeldsp_altivec.c @@ -21,18 +21,19 @@ */ #include "config.h" -#include "libavutil/attributes.h" -#include "libavutil/cpu.h" -#include "libavcodec/hpeldsp.h" -#if HAVE_ALTIVEC #if HAVE_ALTIVEC_H #include <altivec.h> #endif + +#include "libavutil/attributes.h" +#include "libavutil/cpu.h" #include "libavutil/ppc/types_altivec.h" #include "libavutil/ppc/util_altivec.h" +#include "libavcodec/hpeldsp.h" #include "dsputil_altivec.h" +#if HAVE_ALTIVEC /* next one assumes that ((line_size % 16) == 0) */ void ff_put_pixels16_altivec(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h) { diff --git a/libavcodec/ppc/vp3dsp_altivec.c b/libavcodec/ppc/vp3dsp_altivec.c index cc587b0755..502b8b7266 100644 --- a/libavcodec/ppc/vp3dsp_altivec.c +++ b/libavcodec/ppc/vp3dsp_altivec.c @@ -23,14 +23,13 @@ #include "config.h" #include "libavutil/attributes.h" #include "libavutil/cpu.h" -#include "libavcodec/vp3dsp.h" - -#if HAVE_ALTIVEC - #include "libavutil/ppc/types_altivec.h" #include "libavutil/ppc/util_altivec.h" +#include "libavcodec/vp3dsp.h" #include "dsputil_altivec.h" +#if HAVE_ALTIVEC + static const vec_s16 constants = {0, 64277, 60547, 54491, 46341, 36410, 25080, 12785}; static const vec_u8 interleave_high = |