diff --git a/libavcodec/ppc/dsputil_altivec.h b/libavcodec/ppc/dsputil_altivec.h index 7762d34340..846b4c4d68 100644 --- a/libavcodec/ppc/dsputil_altivec.h +++ b/libavcodec/ppc/dsputil_altivec.h @@ -25,8 +25,6 @@ #include "dsputil_ppc.h" -#ifdef HAVE_ALTIVEC - extern int has_altivec(void); void put_pixels16_altivec(uint8_t *block, const uint8_t *pixels, int line_size, int h); @@ -112,6 +110,4 @@ static inline vector unsigned char unaligned_load(int offset, uint8_t *src) return vec_perm(first, second, mask); } -#endif /* HAVE_ALTIVEC */ - #endif /* DSPUTIL_ALTIVEC_H */ diff --git a/libavcodec/ppc/h264_altivec.c b/libavcodec/ppc/h264_altivec.c index cb13aadc4e..ef86a528d8 100644 --- a/libavcodec/ppc/h264_altivec.c +++ b/libavcodec/ppc/h264_altivec.c @@ -868,7 +868,6 @@ static void h264_h_loop_filter_luma_altivec(uint8_t *pix, int stride, int alpha, void dsputil_h264_init_ppc(DSPContext* c, AVCodecContext *avctx) { -#ifdef HAVE_ALTIVEC if (has_altivec()) { c->put_h264_chroma_pixels_tab[0] = put_h264_chroma_mc8_altivec; c->put_no_rnd_h264_chroma_pixels_tab[0] = put_no_rnd_h264_chroma_mc8_altivec; @@ -899,12 +898,5 @@ void dsputil_h264_init_ppc(DSPContext* c, AVCodecContext *avctx) { dspfunc(put_h264_qpel, 0, 16); dspfunc(avg_h264_qpel, 0, 16); #undef dspfunc - - } else -#endif /* HAVE_ALTIVEC */ - { - // Non-AltiVec PPC optimisations - - // ... pending ... } }