RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-24 08:12:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit '03c9f357a4c2307a7913cea2cbf0ba817e80beb6'

Browse Source 
* 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:
Michael Niedermayer 2014-08-01 15:11:05 +02:00
commit ad99837b63
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/ppc/idctdsp.c
View File

@ -247,7 +247,9 @@ av_cold void ff_idctdsp_init_ppc(IDCTDSPContext *c, AVCodecContext *avctx,
unsigned high_bit_depth) unsigned high_bit_depth)
{ {
#if HAVE_ALTIVEC #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 (!high_bit_depth && avctx->lowres == 0) {
if ((avctx->idct_algo == FF_IDCT_AUTO && !(avctx->flags & CODEC_FLAG_BITEXACT)) || if ((avctx->idct_algo == FF_IDCT_AUTO && !(avctx->flags & CODEC_FLAG_BITEXACT)) ||
(avctx->idct_algo == FF_IDCT_ALTIVEC)) { (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; c->perm_type = FF_IDCT_PERM_TRANSPOSE;
} }
} }
}
#endif /* HAVE_ALTIVEC */ #endif /* HAVE_ALTIVEC */
} }