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/fmtconvert.c | |
| parent | ebd99ff112e8993330dd39959c22dfe1ab17d5c0 (diff) | |
| parent | 38282149b6ce8f4b8361e3b84542ba9aa8a1f32f (diff) | |
| download | ffmpeg-streaming-cae8f469fee7c32685f04a2b507251119d6875ef.zip ffmpeg-streaming-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/fmtconvert.c')
| -rw-r--r-- | libavcodec/fmtconvert.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/fmtconvert.c b/libavcodec/fmtconvert.c index 79e9645..632c11d 100644 --- a/libavcodec/fmtconvert.c +++ b/libavcodec/fmtconvert.c @@ -84,7 +84,7 @@ av_cold void ff_fmt_convert_init(FmtConvertContext *c, AVCodecContext *avctx) c->float_interleave = ff_float_interleave_c; if (ARCH_ARM) ff_fmt_convert_init_arm(c, avctx); - if (HAVE_ALTIVEC) ff_fmt_convert_init_altivec(c, avctx); + if (ARCH_PPC) ff_fmt_convert_init_ppc(c, avctx); if (ARCH_X86) ff_fmt_convert_init_x86(c, avctx); if (HAVE_MIPSFPU) ff_fmt_convert_init_mips(c); } |
