Commit 2722c981 authored by Diego Biurrun's avatar Diego Biurrun

Remove HAVE_ALTIVEC preprocessor directives that are only compiled

when AltiVec is enabled anyway.

Originally committed as revision 10216 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 777bbfdd
...@@ -25,8 +25,6 @@ ...@@ -25,8 +25,6 @@
#include "dsputil_ppc.h" #include "dsputil_ppc.h"
#ifdef HAVE_ALTIVEC
extern int has_altivec(void); extern int has_altivec(void);
void put_pixels16_altivec(uint8_t *block, const uint8_t *pixels, int line_size, int h); 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) ...@@ -112,6 +110,4 @@ static inline vector unsigned char unaligned_load(int offset, uint8_t *src)
return vec_perm(first, second, mask); return vec_perm(first, second, mask);
} }
#endif /* HAVE_ALTIVEC */
#endif /* DSPUTIL_ALTIVEC_H */ #endif /* DSPUTIL_ALTIVEC_H */
...@@ -868,7 +868,6 @@ static void h264_h_loop_filter_luma_altivec(uint8_t *pix, int stride, int alpha, ...@@ -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) { void dsputil_h264_init_ppc(DSPContext* c, AVCodecContext *avctx) {
#ifdef HAVE_ALTIVEC
if (has_altivec()) { if (has_altivec()) {
c->put_h264_chroma_pixels_tab[0] = put_h264_chroma_mc8_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; 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) { ...@@ -899,12 +898,5 @@ void dsputil_h264_init_ppc(DSPContext* c, AVCodecContext *avctx) {
dspfunc(put_h264_qpel, 0, 16); dspfunc(put_h264_qpel, 0, 16);
dspfunc(avg_h264_qpel, 0, 16); dspfunc(avg_h264_qpel, 0, 16);
#undef dspfunc #undef dspfunc
} else
#endif /* HAVE_ALTIVEC */
{
// Non-AltiVec PPC optimisations
// ... pending ...
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment