altivec compilation fixes by (Magnus Damm <damm at opensource dot se>)

Originally committed as revision 1635 to svn://svn.ffmpeg.org/ffmpeg/trunk
pull/126/head
Michael Niedermayer 22 years ago
parent 983e3246b7
commit 105645219a
  1. 2
      libavcodec/ppc/mpegvideo_altivec.c
  2. 8
      libavcodec/ppc/mpegvideo_ppc.c

@ -504,7 +504,7 @@ int dct_quantize_altivec(MpegEncContext* s,
(s->dsp.idct_permutation_type != FF_TRANSPOSE_IDCT_PERM) && (s->dsp.idct_permutation_type != FF_TRANSPOSE_IDCT_PERM) &&
(s->dsp.idct_permutation_type != FF_NO_IDCT_PERM)) (s->dsp.idct_permutation_type != FF_NO_IDCT_PERM))
{ {
ff_block_permute(data, s->idsp.dct_permutation, ff_block_permute(data, s->dsp.idct_permutation,
s->intra_scantable.scantable, lastNonZero); s->intra_scantable.scantable, lastNonZero);
} }

@ -42,12 +42,12 @@ void MPV_common_init_ppc(MpegEncContext *s)
if ((s->avctx->idct_algo == FF_IDCT_AUTO) || if ((s->avctx->idct_algo == FF_IDCT_AUTO) ||
(s->avctx->idct_algo == FF_IDCT_ALTIVEC)) (s->avctx->idct_algo == FF_IDCT_ALTIVEC))
{ {
s->idct_put = idct_put_altivec; s->dsp.idct_put = idct_put_altivec;
s->idct_add = idct_add_altivec; s->dsp.idct_add = idct_add_altivec;
#ifndef ALTIVEC_USE_REFERENCE_C_CODE #ifndef ALTIVEC_USE_REFERENCE_C_CODE
s->idct_permutation_type = FF_TRANSPOSE_IDCT_PERM; s->dsp.idct_permutation_type = FF_TRANSPOSE_IDCT_PERM;
#else /* ALTIVEC_USE_REFERENCE_C_CODE */ #else /* ALTIVEC_USE_REFERENCE_C_CODE */
s->idct_permutation_type = FF_NO_IDCT_PERM; s->dsp.idct_permutation_type = FF_NO_IDCT_PERM;
#endif /* ALTIVEC_USE_REFERENCE_C_CODE */ #endif /* ALTIVEC_USE_REFERENCE_C_CODE */
} }

Loading…
Cancel
Save