diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-01 15:11:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-01 15:11:05 +0200 |
| commit | ad99837b638f1271da37dbe75d409b1350ad556e (patch) | |
| tree | 40bdfb426c9f372de95ca17bc8066ca1163eb2e0 | |
| parent | 713dbe0655e4c3a906b0d812a6f90ac161223876 (diff) | |
| parent | 03c9f357a4c2307a7913cea2cbf0ba817e80beb6 (diff) | |
| download | ffmpeg-ad99837b638f1271da37dbe75d409b1350ad556e.tar.gz | |
Merge commit '03c9f357a4c2307a7913cea2cbf0ba817e80beb6'
* commit '03c9f357a4c2307a7913cea2cbf0ba817e80beb6':
ppc: idctdsp: Immediately return if no AltiVec is available
Conflicts:
libavcodec/ppc/idctdsp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/ppc/idctdsp.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/libavcodec/ppc/idctdsp.c b/libavcodec/ppc/idctdsp.c index 419f18802f..5ef514b51b 100644 --- a/libavcodec/ppc/idctdsp.c +++ b/libavcodec/ppc/idctdsp.c @@ -247,15 +247,16 @@ av_cold void ff_idctdsp_init_ppc(IDCTDSPContext *c, AVCodecContext *avctx, unsigned high_bit_depth) { #if HAVE_ALTIVEC - if (PPC_ALTIVEC(av_get_cpu_flags())) { - if (!high_bit_depth && avctx->lowres == 0) { - if ((avctx->idct_algo == FF_IDCT_AUTO && !(avctx->flags & CODEC_FLAG_BITEXACT)) || - (avctx->idct_algo == FF_IDCT_ALTIVEC)) { - c->idct = idct_altivec; - c->idct_add = idct_add_altivec; - c->idct_put = idct_put_altivec; - c->perm_type = FF_IDCT_PERM_TRANSPOSE; - } + if (!PPC_ALTIVEC(av_get_cpu_flags())) + return; + + if (!high_bit_depth && avctx->lowres == 0) { + if ((avctx->idct_algo == FF_IDCT_AUTO && !(avctx->flags & CODEC_FLAG_BITEXACT)) || + (avctx->idct_algo == FF_IDCT_ALTIVEC)) { + c->idct = idct_altivec; + c->idct_add = idct_add_altivec; + c->idct_put = idct_put_altivec; + c->perm_type = FF_IDCT_PERM_TRANSPOSE; } } #endif /* HAVE_ALTIVEC */ |