diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-01 20:08:13 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-01 20:08:13 +0400 |
| commit | cae8f469fee7c32685f04a2b507251119d6875ef (patch) | |
| tree | 1f0ca385d3ab050c391736551a370184a24dcbf0 /libavcodec/fmtconvert.h | |
| 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/fmtconvert.h')
| -rw-r--r-- | libavcodec/fmtconvert.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/fmtconvert.h b/libavcodec/fmtconvert.h index 3fb9f4e46b..473a5868b9 100644 --- a/libavcodec/fmtconvert.h +++ b/libavcodec/fmtconvert.h @@ -90,7 +90,7 @@ void ff_float_interleave_c(float *dst, const float **src, unsigned int len, void ff_fmt_convert_init(FmtConvertContext *c, AVCodecContext *avctx); void ff_fmt_convert_init_arm(FmtConvertContext *c, AVCodecContext *avctx); -void ff_fmt_convert_init_altivec(FmtConvertContext *c, AVCodecContext *avctx); +void ff_fmt_convert_init_ppc(FmtConvertContext *c, AVCodecContext *avctx); void ff_fmt_convert_init_x86(FmtConvertContext *c, AVCodecContext *avctx); void ff_fmt_convert_init_mips(FmtConvertContext *c); |