diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-08 03:12:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-08 03:19:06 +0200 |
| commit | 14e2406de7d211d50fcce0059c90103bdaa947aa (patch) | |
| tree | 10e20cd60b4f4bc91d14957b9565871cdd0381c3 /libavcodec/ppc/dsputil_ppc.c | |
| parent | 5c7bf354dc0c8bea6e7af21c0bc2edad92974274 (diff) | |
| parent | a9aee08d900f686e966c64afec5d88a7d9d130a3 (diff) | |
| download | ffmpeg-14e2406de7d211d50fcce0059c90103bdaa947aa.tar.gz | |
Merge commit 'a9aee08d900f686e966c64afec5d88a7d9d130a3'
* commit 'a9aee08d900f686e966c64afec5d88a7d9d130a3':
dsputil: Split off FDCT bits into their own context
Conflicts:
configure
libavcodec/Makefile
libavcodec/asvenc.c
libavcodec/dnxhdenc.c
libavcodec/dsputil.c
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c
libavcodec/x86/Makefile
libavcodec/x86/dsputilenc_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ppc/dsputil_ppc.c')
| -rw-r--r-- | libavcodec/ppc/dsputil_ppc.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/libavcodec/ppc/dsputil_ppc.c b/libavcodec/ppc/dsputil_ppc.c index e0db9d484d..720aafba80 100644 --- a/libavcodec/ppc/dsputil_ppc.c +++ b/libavcodec/ppc/dsputil_ppc.c @@ -35,14 +35,5 @@ av_cold void ff_dsputil_init_ppc(DSPContext *c, AVCodecContext *avctx, int mm_flags = av_get_cpu_flags(); if (PPC_ALTIVEC(mm_flags)) { ff_dsputil_init_altivec(c, avctx, high_bit_depth); - - if (!high_bit_depth) { -#if CONFIG_ENCODERS - if (avctx->dct_algo == FF_DCT_AUTO || - avctx->dct_algo == FF_DCT_ALTIVEC) { - c->fdct = ff_fdct_altivec; - } -#endif //CONFIG_ENCODERS - } } } |