diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-02 10:59:41 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-02 10:59:48 +0100 |
| commit | be2312aa8f05a301ccc90c60a6671c33b371e370 (patch) | |
| tree | 429610b6adbface494d28cdfde896a75088c0a96 /libavcodec/dsputil.c | |
| parent | e3d7a3978b857e32b32575ff78ecc7d67a18687e (diff) | |
| parent | 7ffaa195704a7805a4342e58406904e6de17fef5 (diff) | |
| download | ffmpeg-be2312aa8f05a301ccc90c60a6671c33b371e370.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
dsputil: x86: Move ff_inv_zigzag_direct16 table init to mpegvideo
If someone optimizes dct_quantize for non x86 SIMD, then this
probably needs to be reverted.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dsputil.c')
| -rw-r--r-- | libavcodec/dsputil.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c index 5334a0f540..808b61510d 100644 --- a/libavcodec/dsputil.c +++ b/libavcodec/dsputil.c @@ -69,9 +69,6 @@ const uint8_t ff_zigzag248_direct[64] = { 53, 61, 54, 62, 39, 47, 55, 63, }; -/* not permutated inverse zigzag_direct + 1 for MMX quantizer */ -DECLARE_ALIGNED(16, uint16_t, ff_inv_zigzag_direct16)[64]; - const uint8_t ff_alternate_horizontal_scan[64] = { 0, 1, 2, 3, 8, 9, 16, 17, 10, 11, 4, 5, 6, 7, 15, 14, @@ -2577,8 +2574,6 @@ av_cold void ff_dsputil_static_init(void) for(i=0;i<512;i++) { ff_squareTbl[i] = (i - 256) * (i - 256); } - - for(i=0; i<64; i++) ff_inv_zigzag_direct16[ff_zigzag_direct[i]]= i+1; } int ff_check_alignment(void){ |