diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-18 22:16:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-18 22:16:04 +0200 |
| commit | 521f5697348d96ac7c725bc2cba14d6ce4944334 (patch) | |
| tree | 6ab1a8b2b02141859532a4b5d9e35d5a3188e02d /libavcodec/ppc | |
| parent | 42d326353c17085a98f0e81844f0c6320d70e8f3 (diff) | |
| parent | 8b0dd4942aac320d1ca3c40fa7ea1be342c71273 (diff) | |
| download | ffmpeg-streaming-521f5697348d96ac7c725bc2cba14d6ce4944334.zip ffmpeg-streaming-521f5697348d96ac7c725bc2cba14d6ce4944334.tar.gz | |
Merge commit '8b0dd4942aac320d1ca3c40fa7ea1be342c71273'
* commit '8b0dd4942aac320d1ca3c40fa7ea1be342c71273':
idctdsp: prettyprinting cosmetics
Conflicts:
libavcodec/idctdsp.c
libavcodec/ppc/idctdsp.c
libavcodec/x86/idctdsp_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ppc')
| -rw-r--r-- | libavcodec/ppc/idctdsp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/ppc/idctdsp.c b/libavcodec/ppc/idctdsp.c index 2d36da1..6cc660f 100644 --- a/libavcodec/ppc/idctdsp.c +++ b/libavcodec/ppc/idctdsp.c @@ -251,10 +251,10 @@ av_cold void ff_idctdsp_init_ppc(IDCTDSPContext *c, AVCodecContext *avctx, if (!high_bit_depth && avctx->lowres == 0) { if ((avctx->idct_algo == FF_IDCT_AUTO) || (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; + c->idct = idct_altivec; + c->idct_add = idct_add_altivec; + c->idct_put = idct_put_altivec; + c->perm_type = FF_IDCT_PERM_TRANSPOSE; } } } |
