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/mpegaudiodsp.h | |
| 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/mpegaudiodsp.h')
| -rw-r--r-- | libavcodec/mpegaudiodsp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mpegaudiodsp.h b/libavcodec/mpegaudiodsp.h index 623d2dfffb..8153cb18dc 100644 --- a/libavcodec/mpegaudiodsp.h +++ b/libavcodec/mpegaudiodsp.h @@ -56,8 +56,8 @@ void ff_mpa_synth_filter_float(MPADSPContext *s, float *sb_samples); void ff_mpadsp_init_arm(MPADSPContext *s); +void ff_mpadsp_init_ppc(MPADSPContext *s); void ff_mpadsp_init_x86(MPADSPContext *s); -void ff_mpadsp_init_altivec(MPADSPContext *s); void ff_mpadsp_init_mipsfpu(MPADSPContext *s); void ff_mpadsp_init_mipsdspr1(MPADSPContext *s); |