diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-01 18:02:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-01 18:02:36 +0200 |
| commit | ebd99ff112e8993330dd39959c22dfe1ab17d5c0 (patch) | |
| tree | d3d9c3e9aa718b0621f13644d0867490d4aee992 /libavcodec/ppc/h264chroma_init.c | |
| parent | 148f69eb4e4ce63b911a53bcb883b77b364f13bd (diff) | |
| parent | 42b9150b0d4f0a130c1d93dc991fd5412743a8cf (diff) | |
| download | ffmpeg-ebd99ff112e8993330dd39959c22dfe1ab17d5c0.tar.gz | |
Merge commit '42b9150b0d4f0a130c1d93dc991fd5412743a8cf'
* commit '42b9150b0d4f0a130c1d93dc991fd5412743a8cf':
fft: Remove pointless #ifdefs around function declarations
ppc: Move AltiVec utility headers out of AltiVec ifdefs
Conflicts:
libavcodec/fft.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ppc/h264chroma_init.c')
| -rw-r--r-- | libavcodec/ppc/h264chroma_init.c | 5 |
1 files changed, 2 insertions, 3 deletions
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) |