diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-01 18:08:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-01 18:08:13 +0200 |
| commit | cae8f469fee7c32685f04a2b507251119d6875ef (patch) | |
| tree | 1f0ca385d3ab050c391736551a370184a24dcbf0 /libavcodec/ppc/mpegaudiodsp_altivec.c | |
| parent | ebd99ff112e8993330dd39959c22dfe1ab17d5c0 (diff) | |
| parent | 38282149b6ce8f4b8361e3b84542ba9aa8a1f32f (diff) | |
| download | ffmpeg-cae8f469fee7c32685f04a2b507251119d6875ef.tar.gz | |
Merge commit '38282149b6ce8f4b8361e3b84542ba9aa8a1f32f'
* commit '38282149b6ce8f4b8361e3b84542ba9aa8a1f32f':
ppc: More consistent arch initialization
Conflicts:
libavcodec/fft.h
libavcodec/mpegaudiodsp.c
libavcodec/mpegaudiodsp.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ppc/mpegaudiodsp_altivec.c')
| -rw-r--r-- | libavcodec/ppc/mpegaudiodsp_altivec.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/libavcodec/ppc/mpegaudiodsp_altivec.c b/libavcodec/ppc/mpegaudiodsp_altivec.c index 1152fd77ac..1d82f74828 100644 --- a/libavcodec/ppc/mpegaudiodsp_altivec.c +++ b/libavcodec/ppc/mpegaudiodsp_altivec.c @@ -19,11 +19,14 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "dsputil_altivec.h" +#include "config.h" #include "libavutil/attributes.h" #include "libavutil/internal.h" #include "libavutil/ppc/util_altivec.h" #include "libavcodec/mpegaudiodsp.h" +#include "dsputil_altivec.h" + +#if HAVE_ALTIVEC #define MACS(rt, ra, rb) rt+=(ra)*(rb) #define MLSS(rt, ra, rb) rt-=(ra)*(rb) @@ -124,7 +127,11 @@ static void apply_window_mp3(float *in, float *win, int *unused, float *out, *out = sum; } -av_cold void ff_mpadsp_init_altivec(MPADSPContext *s) +#endif /* HAVE_ALTIVEC */ + +av_cold void ff_mpadsp_init_ppc(MPADSPContext *s) { +#if HAVE_ALTIVEC s->apply_window_float = apply_window_mp3; +#endif /* HAVE_ALTIVEC */ } |