mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-12-23 15:53:08 +00:00
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>
This commit is contained in:
commit
ad99837b63
@ -247,7 +247,9 @@ 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 (!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)) {
|
||||
@ -257,6 +259,5 @@ av_cold void ff_idctdsp_init_ppc(IDCTDSPContext *c, AVCodecContext *avctx,
|
||||
c->perm_type = FF_IDCT_PERM_TRANSPOSE;
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif /* HAVE_ALTIVEC */
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user