diff options
| author | Diego Biurrun <diego@biurrun.de> | 2013-04-27 00:37:32 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2013-04-30 12:19:44 +0200 |
| commit | a053dbfcfb3aca091773c38e82bdd0863216fc7b (patch) | |
| tree | 4a5ff106a0b9507e549f0ea266da3ce89d1fc78b | |
| parent | f5eecee865a731d2412fde2f73c29f8f8115c499 (diff) | |
| download | ffmpeg-a053dbfcfb3aca091773c38e82bdd0863216fc7b.tar.gz | |
ppc: Move AltiVec utility headers out of AltiVec ifdefs
Now that the headers themselves have ifdef protection this is no
longer necessary and more consistent with normal include handling.
| -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 |
4 files changed, 13 insertions, 14 deletions
diff --git a/libavcodec/ppc/h264chroma_init.c b/libavcodec/ppc/h264chroma_init.c index 06456ec6e6..f36d8e94bd 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 7700294bb3..113617c98f 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 868ca95d89..69c2777d70 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 c512047b82..48436f3337 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 = |