Commit 18f244a180 for ffmpeg

commit 18f244a1801e99243a95016b08af5ede08afac13
Author: Kacper Michajłow <kasper93@gmail.com>
Date:   Mon Oct 26 16:05:30 2026 +0100

    avcodec/ppc: build the AltiVec files only with AltiVec

    Without AltiVec the *_altivec.c files only build init functions with
    empty bodies that are never called. Build them as ALTIVEC-OBJS, like
    blockdsp_altivec.c, and drop their HAVE_ALTIVEC checks.

    Signed-off-by: Kacper Michajłow <kasper93@gmail.com>

diff --git a/libavcodec/ppc/Makefile b/libavcodec/ppc/Makefile
index 2cbd060eb1..ce2c2a4c8a 100644
--- a/libavcodec/ppc/Makefile
+++ b/libavcodec/ppc/Makefile
@@ -1,30 +1,53 @@
 # subsystems
-OBJS-$(CONFIG_AUDIODSP)                += ppc/audiodsp_init.o ppc/audiodsp_altivec.o
+OBJS-$(CONFIG_AUDIODSP)                += ppc/audiodsp_init.o
 OBJS-$(CONFIG_BLOCKDSP)                += ppc/blockdsp.o
-OBJS-$(CONFIG_FDCTDSP)                 += ppc/fdctdsp_init.o ppc/fdctdsp_altivec.o
-OBJS-$(CONFIG_H264CHROMA)              += ppc/h264chroma_init.o ppc/h264chroma_altivec.o
-OBJS-$(CONFIG_H264DSP)                 += ppc/h264dsp_init.o ppc/h264dsp_altivec.o ppc/hpeldsp_altivec.o
-OBJS-$(CONFIG_H264QPEL)                += ppc/h264qpel_init.o ppc/h264qpel_altivec.o
-OBJS-$(CONFIG_HPELDSP)                 += ppc/hpeldsp_init.o ppc/hpeldsp_altivec.o
-OBJS-$(CONFIG_IDCTDSP)                 += ppc/idctdsp_init.o ppc/idctdsp_altivec.o
-OBJS-$(CONFIG_LLVIDDSP)                += ppc/lossless_videodsp_init.o ppc/lossless_videodsp_altivec.o
-OBJS-$(CONFIG_ME_CMP)                  += ppc/me_cmp_init.o ppc/me_cmp_altivec.o
-OBJS-$(CONFIG_MPEGAUDIODSP)            += ppc/mpegaudiodsp_init.o ppc/mpegaudiodsp_altivec.o
-OBJS-$(CONFIG_MPEGVIDEO)               += ppc/mpegvideo_init.o ppc/mpegvideo_altivec.o
-OBJS-$(CONFIG_MPEGVIDEOENCDSP)         += ppc/mpegvideoencdsp_init.o ppc/mpegvideoencdsp_altivec.o
-OBJS-$(CONFIG_PIXBLOCKDSP)             += ppc/pixblockdsp_init.o ppc/pixblockdsp_altivec.o
-OBJS-$(CONFIG_VC1DSP)                  += ppc/vc1dsp_init.o ppc/vc1dsp_altivec.o
+OBJS-$(CONFIG_FDCTDSP)                 += ppc/fdctdsp_init.o
+OBJS-$(CONFIG_H264CHROMA)              += ppc/h264chroma_init.o
+OBJS-$(CONFIG_H264DSP)                 += ppc/h264dsp_init.o
+OBJS-$(CONFIG_H264QPEL)                += ppc/h264qpel_init.o
+OBJS-$(CONFIG_HPELDSP)                 += ppc/hpeldsp_init.o
+OBJS-$(CONFIG_IDCTDSP)                 += ppc/idctdsp_init.o
+OBJS-$(CONFIG_LLVIDDSP)                += ppc/lossless_videodsp_init.o
+OBJS-$(CONFIG_ME_CMP)                  += ppc/me_cmp_init.o
+OBJS-$(CONFIG_MPEGAUDIODSP)            += ppc/mpegaudiodsp_init.o
+OBJS-$(CONFIG_MPEGVIDEO)               += ppc/mpegvideo_init.o
+OBJS-$(CONFIG_MPEGVIDEOENCDSP)         += ppc/mpegvideoencdsp_init.o
+OBJS-$(CONFIG_PIXBLOCKDSP)             += ppc/pixblockdsp_init.o
+OBJS-$(CONFIG_VC1DSP)                  += ppc/vc1dsp_init.o
 OBJS-$(CONFIG_VIDEODSP)                += ppc/videodsp.o
-OBJS-$(CONFIG_VP3DSP)                  += ppc/vp3dsp_init.o ppc/vp3dsp_altivec.o
-OBJS-$(CONFIG_VP8DSP)                  += ppc/vp8dsp_init.o ppc/vp8dsp_altivec.o
+OBJS-$(CONFIG_VP3DSP)                  += ppc/vp3dsp_init.o
+OBJS-$(CONFIG_VP8DSP)                  += ppc/vp8dsp_init.o

 # decoders/encoders
-OBJS-$(CONFIG_HEVC_DECODER)            += ppc/hevcdsp_init.o ppc/hevcdsp_altivec.o
-OBJS-$(CONFIG_MPEG4_DECODER)           += ppc/mpeg4videodsp_init.o ppc/mpeg4videodsp_altivec.o
-OBJS-$(CONFIG_SVQ1_ENCODER)            += ppc/svq1enc_init.o ppc/svq1enc_altivec.o
-OBJS-$(CONFIG_VORBIS_DECODER)          += ppc/vorbisdsp_init.o ppc/vorbisdsp_altivec.o
-OBJS-$(CONFIG_VP7_DECODER)             += ppc/vp8dsp_init.o ppc/vp8dsp_altivec.o
+OBJS-$(CONFIG_HEVC_DECODER)            += ppc/hevcdsp_init.o
+OBJS-$(CONFIG_MPEG4_DECODER)           += ppc/mpeg4videodsp_init.o
+OBJS-$(CONFIG_SVQ1_ENCODER)            += ppc/svq1enc_init.o
+OBJS-$(CONFIG_VORBIS_DECODER)          += ppc/vorbisdsp_init.o
+OBJS-$(CONFIG_VP7_DECODER)             += ppc/vp8dsp_init.o

 # AltiVec optimizations
 # subsystems
+ALTIVEC-OBJS-$(CONFIG_AUDIODSP)        += ppc/audiodsp_altivec.o
 ALTIVEC-OBJS-$(CONFIG_BLOCKDSP)        += ppc/blockdsp_altivec.o
+ALTIVEC-OBJS-$(CONFIG_FDCTDSP)         += ppc/fdctdsp_altivec.o
+ALTIVEC-OBJS-$(CONFIG_H264CHROMA)      += ppc/h264chroma_altivec.o
+ALTIVEC-OBJS-$(CONFIG_H264DSP)         += ppc/h264dsp_altivec.o ppc/hpeldsp_altivec.o
+ALTIVEC-OBJS-$(CONFIG_H264QPEL)        += ppc/h264qpel_altivec.o
+ALTIVEC-OBJS-$(CONFIG_HPELDSP)         += ppc/hpeldsp_altivec.o
+ALTIVEC-OBJS-$(CONFIG_IDCTDSP)         += ppc/idctdsp_altivec.o
+ALTIVEC-OBJS-$(CONFIG_LLVIDDSP)        += ppc/lossless_videodsp_altivec.o
+ALTIVEC-OBJS-$(CONFIG_ME_CMP)          += ppc/me_cmp_altivec.o
+ALTIVEC-OBJS-$(CONFIG_MPEGAUDIODSP)    += ppc/mpegaudiodsp_altivec.o
+ALTIVEC-OBJS-$(CONFIG_MPEGVIDEO)       += ppc/mpegvideo_altivec.o
+ALTIVEC-OBJS-$(CONFIG_MPEGVIDEOENCDSP) += ppc/mpegvideoencdsp_altivec.o
+ALTIVEC-OBJS-$(CONFIG_PIXBLOCKDSP)     += ppc/pixblockdsp_altivec.o
+ALTIVEC-OBJS-$(CONFIG_VC1DSP)          += ppc/vc1dsp_altivec.o
+ALTIVEC-OBJS-$(CONFIG_VP3DSP)          += ppc/vp3dsp_altivec.o
+ALTIVEC-OBJS-$(CONFIG_VP8DSP)          += ppc/vp8dsp_altivec.o
+
+# decoders/encoders
+ALTIVEC-OBJS-$(CONFIG_HEVC_DECODER)    += ppc/hevcdsp_altivec.o
+ALTIVEC-OBJS-$(CONFIG_MPEG4_DECODER)   += ppc/mpeg4videodsp_altivec.o
+ALTIVEC-OBJS-$(CONFIG_SVQ1_ENCODER)    += ppc/svq1enc_altivec.o
+ALTIVEC-OBJS-$(CONFIG_VORBIS_DECODER)  += ppc/vorbisdsp_altivec.o
+ALTIVEC-OBJS-$(CONFIG_VP7_DECODER)     += ppc/vp8dsp_altivec.o
diff --git a/libavcodec/ppc/audiodsp_altivec.c b/libavcodec/ppc/audiodsp_altivec.c
index 96128eb94a..45c537af63 100644
--- a/libavcodec/ppc/audiodsp_altivec.c
+++ b/libavcodec/ppc/audiodsp_altivec.c
@@ -32,8 +32,6 @@

 #include "audiodsp_altivec.h"

-#if HAVE_ALTIVEC
-
 static int32_t scalarproduct_int16_altivec(const int16_t *v1, const int16_t *v2,
                                            int order)
 {
@@ -56,8 +54,6 @@ static int32_t scalarproduct_int16_altivec(const int16_t *v1, const int16_t *v2,
     return ires;
 }

-#endif /* HAVE_ALTIVEC */
-
 #if HAVE_VSX

 static int32_t scalarproduct_int16_vsx(const int16_t *v1, const int16_t *v2, int order)
@@ -85,9 +81,7 @@ static int32_t scalarproduct_int16_vsx(const int16_t *v1, const int16_t *v2, int

 av_cold void ff_audiodsp_init_altivec(AudioDSPContext *c)
 {
-#if HAVE_ALTIVEC
     c->scalarproduct_int16 = scalarproduct_int16_altivec;
-#endif /* HAVE_ALTIVEC */
 }

 av_cold void ff_audiodsp_init_vsx(AudioDSPContext *c)
diff --git a/libavcodec/ppc/fdctdsp_altivec.c b/libavcodec/ppc/fdctdsp_altivec.c
index a6dc177b73..00d7ca8a4d 100644
--- a/libavcodec/ppc/fdctdsp_altivec.c
+++ b/libavcodec/ppc/fdctdsp_altivec.c
@@ -28,8 +28,6 @@

 #include "fdct.h"

-#if HAVE_ALTIVEC
-
 #define vs16(v)   ((vector signed short) (v))
 #define vs32(v)     ((vector signed int) (v))
 #define  vu8(v)  ((vector unsigned char) (v))
@@ -457,5 +455,3 @@ void ff_fdct_altivec(int16_t *block)
 #undef CTS
     /* }}} */
 }
-
-#endif /* HAVE_ALTIVEC */
diff --git a/libavcodec/ppc/h264chroma_altivec.c b/libavcodec/ppc/h264chroma_altivec.c
index eda5dd2544..e044f8132b 100644
--- a/libavcodec/ppc/h264chroma_altivec.c
+++ b/libavcodec/ppc/h264chroma_altivec.c
@@ -28,7 +28,6 @@

 #include "h264chroma_altivec.h"

-#if HAVE_ALTIVEC
 #define PUT_OP_U8_ALTIVEC(d, s, dst) d = s
 #define AVG_OP_U8_ALTIVEC(d, s, dst) d = vec_avg(dst, s)

@@ -47,16 +46,13 @@
 #undef OP_U8_ALTIVEC
 #undef PREFIX_h264_chroma_mc8_altivec
 #undef PREFIX_h264_chroma_mc8_num
-#endif /* HAVE_ALTIVEC */

 av_cold void ff_h264chroma_init_altivec(H264ChromaContext *c, int bit_depth)
 {
-#if HAVE_ALTIVEC
     const int high_bit_depth = bit_depth > 8;

     if (!high_bit_depth) {
         c->put_h264_chroma_pixels_tab[0] = put_h264_chroma_mc8_altivec;
         c->avg_h264_chroma_pixels_tab[0] = avg_h264_chroma_mc8_altivec;
     }
-#endif /* HAVE_ALTIVEC */
 }
diff --git a/libavcodec/ppc/h264dsp_altivec.c b/libavcodec/ppc/h264dsp_altivec.c
index d997bfff6b..df267b8741 100644
--- a/libavcodec/ppc/h264dsp_altivec.c
+++ b/libavcodec/ppc/h264dsp_altivec.c
@@ -33,8 +33,6 @@

 #include "h264dsp_altivec.h"

-#if HAVE_ALTIVEC
-
 /****************************************************************************
  * IDCT transform:
  ****************************************************************************/
@@ -783,12 +781,10 @@ static void biweight_h264_pixels ## W ## _altivec(uint8_t *dst, uint8_t *src, pt

 H264_WEIGHT(16)
 H264_WEIGHT( 8)
-#endif /* HAVE_ALTIVEC */

 av_cold void ff_h264dsp_init_altivec(H264DSPContext *c, const int bit_depth,
                                      const int chroma_format_idc)
 {
-#if HAVE_ALTIVEC
     if (bit_depth == 8) {
         c->idct_add = h264_idct_add_altivec;
         if (chroma_format_idc <= 1)
@@ -807,5 +803,4 @@ av_cold void ff_h264dsp_init_altivec(H264DSPContext *c, const int bit_depth,
         c->biweight_pixels_tab[0] = biweight_h264_pixels16_altivec;
         c->biweight_pixels_tab[1] = biweight_h264_pixels8_altivec;
     }
-#endif /* HAVE_ALTIVEC */
 }
diff --git a/libavcodec/ppc/h264qpel_altivec.c b/libavcodec/ppc/h264qpel_altivec.c
index d64e4036c1..eec123ddd5 100644
--- a/libavcodec/ppc/h264qpel_altivec.c
+++ b/libavcodec/ppc/h264qpel_altivec.c
@@ -30,8 +30,6 @@
 #include "h264qpel_altivec.h"
 #include "hpeldsp_altivec.h"

-#if HAVE_ALTIVEC
-
 #define PUT_OP_U8_ALTIVEC(d, s, dst) d = s
 #define AVG_OP_U8_ALTIVEC(d, s, dst) d = vec_avg(dst, s)

@@ -277,11 +275,9 @@ static inline void avg_pixels16_l2_altivec( uint8_t * dst, const uint8_t * src1,

 H264_MC(put_, 16, altivec)
 H264_MC(avg_, 16, altivec)
-#endif /* HAVE_ALTIVEC */

 av_cold void ff_h264qpel_init_altivec(H264QpelContext *c, int bit_depth)
 {
-#if HAVE_ALTIVEC
     const int high_bit_depth = bit_depth > 8;

     if (!high_bit_depth) {
@@ -307,5 +303,4 @@ av_cold void ff_h264qpel_init_altivec(H264QpelContext *c, int bit_depth)
         dspfunc(avg_h264_qpel, 0, 16);
 #undef dspfunc
     }
-#endif /* HAVE_ALTIVEC */
 }
diff --git a/libavcodec/ppc/hevcdsp_altivec.c b/libavcodec/ppc/hevcdsp_altivec.c
index 3840b4a8f2..cd96dcd958 100644
--- a/libavcodec/ppc/hevcdsp_altivec.c
+++ b/libavcodec/ppc/hevcdsp_altivec.c
@@ -28,7 +28,6 @@

 #include "hevcdsp_altivec.h"

-#if HAVE_ALTIVEC
 static const vec_s16 trans4[4] = {
     { 64,  64, 64,  64, 64,  64, 64,  64 },
     { 83,  36, 83,  36, 83,  36, 83,  36 },
@@ -105,14 +104,11 @@ static av_always_inline void scale(vec_s32 res[4], vec_s16 res_packed[2],
 #define BIT_DEPTH 10
 #include "hevcdsp_template.c"
 #undef BIT_DEPTH
-#endif /* HAVE_ALTIVEC */

 av_cold void ff_hevc_dsp_init_altivec(HEVCDSPContext *c, const int bit_depth)
 {
-#if HAVE_ALTIVEC
     if (bit_depth == 8)
         c->idct[0] = ff_hevc_idct_4x4_8_altivec;
     if (bit_depth == 10)
         c->idct[0] = ff_hevc_idct_4x4_10_altivec;
-#endif /* HAVE_ALTIVEC */
 }
diff --git a/libavcodec/ppc/hpeldsp_altivec.c b/libavcodec/ppc/hpeldsp_altivec.c
index c8d43abc7c..86033c69d3 100644
--- a/libavcodec/ppc/hpeldsp_altivec.c
+++ b/libavcodec/ppc/hpeldsp_altivec.c
@@ -29,7 +29,6 @@

 #include "hpeldsp_altivec.h"

-#if HAVE_ALTIVEC
 /* next one assumes that ((line_size % 16) == 0) */
 void ff_put_pixels16_altivec(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h)
 {
@@ -361,11 +360,9 @@ static void avg_pixels8_xy2_altivec(uint8_t *block, const uint8_t *pixels, ptrdi
         pixels += line_size;
     }
 }
-#endif /* HAVE_ALTIVEC */

 av_cold void ff_hpeldsp_init_altivec(HpelDSPContext *c, int flags)
 {
-#if HAVE_ALTIVEC
     c->avg_pixels_tab[0][0]        = ff_avg_pixels16_altivec;
     c->avg_pixels_tab[1][0]        = avg_pixels8_altivec;
     c->avg_pixels_tab[1][3]        = avg_pixels8_xy2_altivec;
@@ -377,5 +374,4 @@ av_cold void ff_hpeldsp_init_altivec(HpelDSPContext *c, int flags)
     c->put_no_rnd_pixels_tab[0][0] = ff_put_pixels16_altivec;
     c->put_no_rnd_pixels_tab[1][3] = put_no_rnd_pixels8_xy2_altivec;
     c->put_no_rnd_pixels_tab[0][3] = put_no_rnd_pixels16_xy2_altivec;
-#endif /* HAVE_ALTIVEC */
 }
diff --git a/libavcodec/ppc/idctdsp_altivec.c b/libavcodec/ppc/idctdsp_altivec.c
index 6cae37b94b..cb1bb1f18a 100644
--- a/libavcodec/ppc/idctdsp_altivec.c
+++ b/libavcodec/ppc/idctdsp_altivec.c
@@ -43,8 +43,6 @@

 #include "idctdsp_altivec.h"

-#if HAVE_ALTIVEC
-
 #define IDCT_HALF                                       \
     /* 1st stage */                                     \
     t1 = vec_mradds(a1, vx7, vx1);                      \
@@ -251,12 +249,9 @@ static void idct_add_altivec(uint8_t *dest, ptrdiff_t stride, int16_t *blk)
     ADD(dest, vx7, perm1);
 }

-#endif /* HAVE_ALTIVEC */
-
 av_cold void ff_idctdsp_init_altivec(IDCTDSPContext *c, AVCodecContext *avctx,
                                      unsigned high_bit_depth)
 {
-#if HAVE_ALTIVEC
     if (!high_bit_depth && avctx->lowres == 0) {
         if ((avctx->idct_algo == FF_IDCT_AUTO && !(avctx->flags & AV_CODEC_FLAG_BITEXACT)) ||
             (avctx->idct_algo == FF_IDCT_ALTIVEC)) {
@@ -266,5 +261,4 @@ av_cold void ff_idctdsp_init_altivec(IDCTDSPContext *c, AVCodecContext *avctx,
             c->perm_type = FF_IDCT_PERM_TRANSPOSE;
         }
     }
-#endif /* HAVE_ALTIVEC */
 }
diff --git a/libavcodec/ppc/lossless_videodsp_altivec.c b/libavcodec/ppc/lossless_videodsp_altivec.c
index 98e8fe8d16..1353d05462 100644
--- a/libavcodec/ppc/lossless_videodsp_altivec.c
+++ b/libavcodec/ppc/lossless_videodsp_altivec.c
@@ -29,7 +29,6 @@

 #include "lossless_videodsp_altivec.h"

-#if HAVE_ALTIVEC
 static void add_bytes_altivec(uint8_t *dst, uint8_t *src, ptrdiff_t w)
 {
     register int i;
@@ -46,11 +45,8 @@ static void add_bytes_altivec(uint8_t *dst, uint8_t *src, ptrdiff_t w)
     for (; i < w; i++)
         dst[i] = src[i];
 }
-#endif /* HAVE_ALTIVEC */

 av_cold void ff_llviddsp_init_altivec(LLVidDSPContext *c)
 {
-#if HAVE_ALTIVEC
     c->add_bytes = add_bytes_altivec;
-#endif /* HAVE_ALTIVEC */
 }
diff --git a/libavcodec/ppc/me_cmp_altivec.c b/libavcodec/ppc/me_cmp_altivec.c
index ce053e97ce..fb6b89669f 100644
--- a/libavcodec/ppc/me_cmp_altivec.c
+++ b/libavcodec/ppc/me_cmp_altivec.c
@@ -31,8 +31,6 @@

 #include "me_cmp_altivec.h"

-#if HAVE_ALTIVEC
-
 #if HAVE_BIGENDIAN
 #define GET_PERM(per1, per2, pix) {\
     per1 = vec_lvsl(0, pix);\
@@ -721,11 +719,9 @@ static int hadamard8_diff16_altivec(MPVEncContext *s, const uint8_t *dst,
     }
     return score;
 }
-#endif /* HAVE_ALTIVEC */

 av_cold void ff_me_cmp_init_altivec(MECmpContext *c, AVCodecContext *avctx)
 {
-#if HAVE_ALTIVEC
     c->pix_abs[0][1] = sad16_x2_altivec;
     c->pix_abs[0][2] = sad16_y2_altivec;
     c->pix_abs[0][3] = sad16_xy2_altivec;
@@ -739,5 +735,4 @@ av_cold void ff_me_cmp_init_altivec(MECmpContext *c, AVCodecContext *avctx)

     c->hadamard8_diff[0] = hadamard8_diff16_altivec;
     c->hadamard8_diff[1] = hadamard8_diff8x8_altivec;
-#endif /* HAVE_ALTIVEC */
 }
diff --git a/libavcodec/ppc/mpeg4videodsp_altivec.c b/libavcodec/ppc/mpeg4videodsp_altivec.c
index 45416b73f2..48d9b629ce 100644
--- a/libavcodec/ppc/mpeg4videodsp_altivec.c
+++ b/libavcodec/ppc/mpeg4videodsp_altivec.c
@@ -28,7 +28,6 @@

 #include "mpeg4videodsp_altivec.h"

-#if HAVE_ALTIVEC
 /* AltiVec-enhanced gmc1. ATM this code assumes stride is a multiple of 8
  * to preserve proper dst alignment. */
 static void gmc1_altivec(uint8_t *dst /* align 8 */, const uint8_t *src /* align1 */,
@@ -126,11 +125,8 @@ static void gmc1_altivec(uint8_t *dst /* align 8 */, const uint8_t *src /* align
         src += stride;
     }
 }
-#endif /* HAVE_ALTIVEC */

 av_cold void ff_mpeg4videodsp_init_altivec(Mpeg4VideoDSPContext *c)
 {
-#if HAVE_ALTIVEC
     c->gmc1 = gmc1_altivec;
-#endif /* HAVE_ALTIVEC */
 }
diff --git a/libavcodec/ppc/mpegaudiodsp_altivec.c b/libavcodec/ppc/mpegaudiodsp_altivec.c
index 638cdc05a1..e128a42369 100644
--- a/libavcodec/ppc/mpegaudiodsp_altivec.c
+++ b/libavcodec/ppc/mpegaudiodsp_altivec.c
@@ -30,8 +30,6 @@

 #include "mpegaudiodsp_altivec.h"

-#if HAVE_ALTIVEC
-
 #define MACS(rt, ra, rb) rt+=(ra)*(rb)
 #define MLSS(rt, ra, rb) rt-=(ra)*(rb)

@@ -131,11 +129,7 @@ static void apply_window_mp3(float *in, float *win, int *unused, float *out,
     *out = sum;
 }

-#endif /* HAVE_ALTIVEC */
-
 av_cold void ff_mpadsp_init_altivec(MPADSPContext *s)
 {
-#if HAVE_ALTIVEC
     s->apply_window_float = apply_window_mp3;
-#endif /* HAVE_ALTIVEC */
 }
diff --git a/libavcodec/ppc/mpegvideo_altivec.c b/libavcodec/ppc/mpegvideo_altivec.c
index 72b50e5107..6b6a581804 100644
--- a/libavcodec/ppc/mpegvideo_altivec.c
+++ b/libavcodec/ppc/mpegvideo_altivec.c
@@ -36,8 +36,6 @@

 #include "mpegvideo_altivec.h"

-#if HAVE_ALTIVEC
-
 /* AltiVec version of dct_unquantize_h263
    this code assumes `block' is 16 bytes-aligned */
 static av_always_inline
@@ -97,12 +95,9 @@ static void dct_unquantize_h263_inter_altivec(const MPVContext *s,

     dct_unquantize_h263_altivec(block, nb_coeffs, qadd, qmul);
 }
-#endif /* HAVE_ALTIVEC */

 av_cold void ff_mpv_unquantize_init_altivec(MPVUnquantDSPContext *s, int bitexact)
 {
-#if HAVE_ALTIVEC
     s->dct_unquantize_h263_intra = dct_unquantize_h263_intra_altivec;
     s->dct_unquantize_h263_inter = dct_unquantize_h263_inter_altivec;
-#endif /* HAVE_ALTIVEC */
 }
diff --git a/libavcodec/ppc/mpegvideoencdsp_altivec.c b/libavcodec/ppc/mpegvideoencdsp_altivec.c
index bd351c0985..b3721ef4a4 100644
--- a/libavcodec/ppc/mpegvideoencdsp_altivec.c
+++ b/libavcodec/ppc/mpegvideoencdsp_altivec.c
@@ -27,8 +27,6 @@

 #include "mpegvideoencdsp_altivec.h"

-#if HAVE_ALTIVEC
-
 #if HAVE_VSX
 static int pix_norm1_altivec(const uint8_t *pix, ptrdiff_t line_size)
 {
@@ -146,13 +144,9 @@ static int pix_sum_altivec(const uint8_t *pix, ptrdiff_t line_size)

 #endif /* HAVE_VSX */

-#endif /* HAVE_ALTIVEC */
-
 av_cold void ff_mpegvideoencdsp_init_altivec(MpegvideoEncDSPContext *c,
                                              AVCodecContext *avctx)
 {
-#if HAVE_ALTIVEC
     c->pix_norm1 = pix_norm1_altivec;
     c->pix_sum   = pix_sum_altivec;
-#endif /* HAVE_ALTIVEC */
 }
diff --git a/libavcodec/ppc/pixblockdsp_altivec.c b/libavcodec/ppc/pixblockdsp_altivec.c
index 6ff6b10961..d78a5d45aa 100644
--- a/libavcodec/ppc/pixblockdsp_altivec.c
+++ b/libavcodec/ppc/pixblockdsp_altivec.c
@@ -29,8 +29,6 @@

 #include "pixblockdsp_altivec.h"

-#if HAVE_ALTIVEC
-
 #if HAVE_VSX
 static void get_pixels_altivec(int16_t *restrict block, const uint8_t *pixels,
                                ptrdiff_t stride)
@@ -225,8 +223,6 @@ static void diff_pixels_altivec(int16_t *restrict block, const uint8_t *s1,

 #endif /* HAVE_VSX */

-#endif /* HAVE_ALTIVEC */
-
 #if HAVE_VSX
 static void get_pixels_vsx(int16_t *restrict block, const uint8_t *pixels,
                            ptrdiff_t stride)
@@ -264,13 +260,11 @@ static void diff_pixels_vsx(int16_t *restrict block, const uint8_t *s1,
 av_cold void ff_pixblockdsp_init_altivec(PixblockDSPContext *c,
                                          unsigned high_bit_depth)
 {
-#if HAVE_ALTIVEC
     c->diff_pixels = diff_pixels_altivec;

     if (!high_bit_depth) {
         c->get_pixels = get_pixels_altivec;
     }
-#endif /* HAVE_ALTIVEC */
 }

 av_cold void ff_pixblockdsp_init_vsx(PixblockDSPContext *c,
diff --git a/libavcodec/ppc/svq1enc_altivec.c b/libavcodec/ppc/svq1enc_altivec.c
index c7a4314fb9..16fe820ad8 100644
--- a/libavcodec/ppc/svq1enc_altivec.c
+++ b/libavcodec/ppc/svq1enc_altivec.c
@@ -29,7 +29,7 @@

 #include "svq1enc_altivec.h"

-#if HAVE_ALTIVEC && HAVE_BIGENDIAN
+#if HAVE_BIGENDIAN
 static int ssd_int8_vs_int16_altivec(const int8_t *pix1, const int16_t *pix2,
                                      intptr_t size)
 {
@@ -69,11 +69,11 @@ static int ssd_int8_vs_int16_altivec(const int8_t *pix1, const int16_t *pix2,

     return u.score[3];
 }
-#endif /* HAVE_ALTIVEC && HAVE_BIGENDIAN */
+#endif /* HAVE_BIGENDIAN */

 av_cold void ff_svq1enc_init_altivec(SVQ1EncDSPContext *c)
 {
-#if HAVE_ALTIVEC && HAVE_BIGENDIAN
+#if HAVE_BIGENDIAN
     c->ssd_int8_vs_int16 = ssd_int8_vs_int16_altivec;
-#endif /* HAVE_ALTIVEC && HAVE_BIGENDIAN */
+#endif /* HAVE_BIGENDIAN */
 }
diff --git a/libavcodec/ppc/vc1dsp_altivec.c b/libavcodec/ppc/vc1dsp_altivec.c
index a319bd217d..fbd071a5bd 100644
--- a/libavcodec/ppc/vc1dsp_altivec.c
+++ b/libavcodec/ppc/vc1dsp_altivec.c
@@ -28,8 +28,6 @@

 #include "vc1dsp_altivec.h"

-#if HAVE_ALTIVEC
-
 // main steps of 8x8 transform
 #define STEP8(s0, s1, s2, s3, s4, s5, s6, s7, vec_rnd) \
 do { \
@@ -351,14 +349,10 @@ static void vc1_inv_trans_8x4_altivec(uint8_t *dest, ptrdiff_t stride,
 #undef OP_U8_ALTIVEC
 #undef PREFIX_no_rnd_vc1_chroma_mc8_altivec

-#endif /* HAVE_ALTIVEC */
-
 av_cold void ff_vc1dsp_init_altivec(VC1DSPContext *dsp)
 {
-#if HAVE_ALTIVEC
     dsp->vc1_inv_trans_8x8 = vc1_inv_trans_8x8_altivec;
     dsp->vc1_inv_trans_8x4 = vc1_inv_trans_8x4_altivec;
     dsp->put_no_rnd_vc1_chroma_pixels_tab[0] = put_no_rnd_vc1_chroma_mc8_altivec;
     dsp->avg_no_rnd_vc1_chroma_pixels_tab[0] = avg_no_rnd_vc1_chroma_mc8_altivec;
-#endif /* HAVE_ALTIVEC */
 }
diff --git a/libavcodec/ppc/vorbisdsp_altivec.c b/libavcodec/ppc/vorbisdsp_altivec.c
index 59745fb4b4..24a1863e01 100644
--- a/libavcodec/ppc/vorbisdsp_altivec.c
+++ b/libavcodec/ppc/vorbisdsp_altivec.c
@@ -27,7 +27,6 @@

 #include "vorbisdsp_altivec.h"

-#if HAVE_ALTIVEC
 static void vorbis_inverse_coupling_altivec(float *mag, float *ang,
                                             ptrdiff_t blocksize)
 {
@@ -50,11 +49,8 @@ static void vorbis_inverse_coupling_altivec(float *mag, float *ang,
         vec_stl(m, 0, mag+i);
     }
 }
-#endif /* HAVE_ALTIVEC */

 av_cold void ff_vorbisdsp_init_altivec(VorbisDSPContext *c)
 {
-#if HAVE_ALTIVEC
     c->vorbis_inverse_coupling = vorbis_inverse_coupling_altivec;
-#endif /* HAVE_ALTIVEC */
 }
diff --git a/libavcodec/ppc/vp3dsp_altivec.c b/libavcodec/ppc/vp3dsp_altivec.c
index 16d6310315..36badb6387 100644
--- a/libavcodec/ppc/vp3dsp_altivec.c
+++ b/libavcodec/ppc/vp3dsp_altivec.c
@@ -29,8 +29,6 @@

 #include "vp3dsp_altivec.h"

-#if HAVE_ALTIVEC
-
 static const vec_s16 constants =
     {0, 64277, 60547, 54491, 46341, 36410, 25080, 12785};
 #if HAVE_BIGENDIAN
@@ -190,12 +188,8 @@ static void vp3_idct_add_altivec(uint8_t *dst, ptrdiff_t stride, int16_t block[6
     memset(block, 0, sizeof(*block) * 64);
 }

-#endif /* HAVE_ALTIVEC */
-
 av_cold void ff_vp3dsp_init_altivec(VP3DSPContext *c)
 {
-#if HAVE_ALTIVEC
     c->idct_put = vp3_idct_put_altivec;
     c->idct_add = vp3_idct_add_altivec;
-#endif
 }
diff --git a/libavcodec/ppc/vp8dsp_altivec.c b/libavcodec/ppc/vp8dsp_altivec.c
index f925722db8..37410b4d5f 100644
--- a/libavcodec/ppc/vp8dsp_altivec.c
+++ b/libavcodec/ppc/vp8dsp_altivec.c
@@ -31,7 +31,6 @@
 #include "hpeldsp_altivec.h"
 #include "vp8dsp_altivec.h"

-#if HAVE_ALTIVEC
 #define REPT4(...) { __VA_ARGS__, __VA_ARGS__, __VA_ARGS__, __VA_ARGS__ }

 // h subpel filter uses msum to multiply+add 4 pixel taps at once
@@ -325,12 +324,8 @@ static void put_vp8_pixels16_altivec(uint8_t *dst, ptrdiff_t dstride, const uint
     }
 }

-#endif /* HAVE_ALTIVEC */
-
-
 av_cold void ff_vp78dsp_init_altivec(VP8DSPContext *c)
 {
-#if HAVE_ALTIVEC
     c->put_vp8_epel_pixels_tab[0][0][0] = put_vp8_pixels16_altivec;
     c->put_vp8_epel_pixels_tab[0][0][2] = put_vp8_epel16_h6_altivec;
     c->put_vp8_epel_pixels_tab[0][2][0] = put_vp8_epel16_v6_altivec;
@@ -355,5 +350,4 @@ av_cold void ff_vp78dsp_init_altivec(VP8DSPContext *c)
     c->put_vp8_epel_pixels_tab[2][1][1] = put_vp8_epel4_h4v4_altivec;
     c->put_vp8_epel_pixels_tab[2][1][2] = put_vp8_epel4_h6v4_altivec;
     c->put_vp8_epel_pixels_tab[2][2][1] = put_vp8_epel4_h4v6_altivec;
-#endif /* HAVE_ALTIVEC */
 }