summaryrefslogtreecommitdiff
path: root/libavcodec/ppc/fmtconvert_altivec.c
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2013-04-14 14:47:30 +0200
committerDiego Biurrun <diego@biurrun.de>2013-04-30 12:19:45 +0200
commit38282149b6ce8f4b8361e3b84542ba9aa8a1f32f (patch)
tree028b5282288a6849233274851112fff4e2d0d25b /libavcodec/ppc/fmtconvert_altivec.c
parent42b9150b0d4f0a130c1d93dc991fd5412743a8cf (diff)
ppc: More consistent arch initialization
Diffstat (limited to 'libavcodec/ppc/fmtconvert_altivec.c')
-rw-r--r--libavcodec/ppc/fmtconvert_altivec.c15
1 files changed, 11 insertions, 4 deletions
diff --git a/libavcodec/ppc/fmtconvert_altivec.c b/libavcodec/ppc/fmtconvert_altivec.c
index 78386f6c8c..c72d0a4cd7 100644
--- a/libavcodec/ppc/fmtconvert_altivec.c
+++ b/libavcodec/ppc/fmtconvert_altivec.c
@@ -18,13 +18,15 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "libavcodec/fmtconvert.h"
-
-#include "libavutil/ppc/util_altivec.h"
+#include "config.h"
#include "libavutil/attributes.h"
#include "libavutil/mem.h"
+#include "libavutil/ppc/util_altivec.h"
+#include "libavcodec/fmtconvert.h"
#include "dsputil_altivec.h"
+#if HAVE_ALTIVEC
+
static void int32_to_float_fmul_scalar_altivec(float *dst, const int *src,
float mul, int len)
{
@@ -156,11 +158,16 @@ static void float_to_int16_interleave_altivec(int16_t *dst, const float **src,
}
}
-av_cold void ff_fmt_convert_init_altivec(FmtConvertContext *c, AVCodecContext *avctx)
+#endif /* HAVE_ALTIVEC */
+
+av_cold void ff_fmt_convert_init_ppc(FmtConvertContext *c,
+ AVCodecContext *avctx)
{
+#if HAVE_ALTIVEC
c->int32_to_float_fmul_scalar = int32_to_float_fmul_scalar_altivec;
if (!(avctx->flags & CODEC_FLAG_BITEXACT)) {
c->float_to_int16 = float_to_int16_altivec;
c->float_to_int16_interleave = float_to_int16_interleave_altivec;
}
+#endif /* HAVE_ALTIVEC */
}