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/mpegvideo.c | |
| parent | ebd99ff112e8993330dd39959c22dfe1ab17d5c0 (diff) | |
| parent | 38282149b6ce8f4b8361e3b84542ba9aa8a1f32f (diff) | |
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/mpegvideo.c')
| -rw-r--r-- | libavcodec/mpegvideo.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 69b10bb164..3f5af5cf53 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -179,10 +179,10 @@ av_cold int ff_dct_common_init(MpegEncContext *s) ff_MPV_common_init_axp(s); #elif ARCH_ARM ff_MPV_common_init_arm(s); -#elif HAVE_ALTIVEC - ff_MPV_common_init_altivec(s); #elif ARCH_BFIN ff_MPV_common_init_bfin(s); +#elif ARCH_PPC + ff_MPV_common_init_ppc(s); #endif /* load & permutate scantables |