diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-07-28 09:27:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-07-28 09:28:01 +0200 |
| commit | 44187717c1611695ff441d22f29c7882bd318ae4 (patch) | |
| tree | 949776a1190eecf80b669ba277b2d83b952dd15d /libavcodec/ppc/mpegvideo_altivec.c | |
| parent | faa338183ba44051e05019411956b41c257c2510 (diff) | |
| parent | ca6a90465634152c7abe2f10112fd06dc778122f (diff) | |
| download | ffmpeg-44187717c1611695ff441d22f29c7882bd318ae4.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
ppc: remove redundant setting of Altivec IDCT
mpegvideo: initialise DSPContext in ff_dct_common_init()
cosmetics: reindent
eac3enc: support writing of basic mixing and info metadata
dnxhdenc: fix declarations in for loops
dsputil: remove stale bink prototypes and comments
dsputil: move a bink-only function to binkdsp
dsputil: remove some unused functions
bink: make IDCT take 32-bit input
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ppc/mpegvideo_altivec.c')
| -rw-r--r-- | libavcodec/ppc/mpegvideo_altivec.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/libavcodec/ppc/mpegvideo_altivec.c b/libavcodec/ppc/mpegvideo_altivec.c index bacdae4079..465971653d 100644 --- a/libavcodec/ppc/mpegvideo_altivec.c +++ b/libavcodec/ppc/mpegvideo_altivec.c @@ -558,15 +558,6 @@ void MPV_common_init_altivec(MpegEncContext *s) { if (!(av_get_cpu_flags() & AV_CPU_FLAG_ALTIVEC)) return; - if (s->avctx->lowres==0) { - if ((s->avctx->idct_algo == FF_IDCT_AUTO) || - (s->avctx->idct_algo == FF_IDCT_ALTIVEC)) { - s->dsp.idct_put = idct_put_altivec; - s->dsp.idct_add = idct_add_altivec; - s->dsp.idct_permutation_type = FF_TRANSPOSE_IDCT_PERM; - } - } - // Test to make sure that the dct required alignments are met. if ((((long)(s->q_intra_matrix) & 0x0f) != 0) || (((long)(s->q_inter_matrix) & 0x0f) != 0)) { |