diff options
| author | Clément Bœsch <u@pkh.me> | 2017-05-19 11:15:16 +0200 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2017-05-19 11:15:16 +0200 |
| commit | 19bb2cade5c8a9d7e666b9b668f7bb8f28e8b759 (patch) | |
| tree | 619ef1db96361610f7b6949eb9586d3ee7c9e932 | |
| parent | 52a4004d8b5f308b3fc83e825dcd9052332eaeef (diff) | |
| parent | b4a911c189962e563a09fb0efaf6fa9ab56263a4 (diff) | |
| download | ffmpeg-19bb2cade5c8a9d7e666b9b668f7bb8f28e8b759.tar.gz | |
Merge commit 'b4a911c189962e563a09fb0efaf6fa9ab56263a4'
* commit 'b4a911c189962e563a09fb0efaf6fa9ab56263a4':
mpegvideoenc: make a table const
Merged-by: Clément Bœsch <u@pkh.me>
| -rw-r--r-- | libavcodec/x86/mpegvideoenc.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libavcodec/x86/mpegvideoenc.c b/libavcodec/x86/mpegvideoenc.c index 67b26178a8..52d59c5694 100644 --- a/libavcodec/x86/mpegvideoenc.c +++ b/libavcodec/x86/mpegvideoenc.c @@ -28,7 +28,12 @@ #include "libavcodec/mpegvideo.h" /* not permutated inverse zigzag_direct + 1 for MMX quantizer */ -DECLARE_ALIGNED(16, static uint16_t, inv_zigzag_direct16)[64]; +DECLARE_ALIGNED(16, static const uint16_t, inv_zigzag_direct16)[64] = { + 1, 2, 6, 7, 15, 16, 28, 29, 3, 5, 8, 14, 17, 27, 30, 43, 4, 9, 13, + 18, 26, 31, 42, 44, 10, 12, 19, 25, 32, 41, 45, 54, 11, 20, 24, 33, 40, 46, + 53, 55, 21, 23, 34, 39, 47, 52, 56, 61, 22, 35, 38, 48, 51, 57, 60, 62, 36, + 37, 49, 50, 58, 59, 63, 64, +}; #if HAVE_6REGS @@ -204,10 +209,6 @@ static void denoise_dct_sse2(MpegEncContext *s, int16_t *block){ av_cold void ff_dct_encode_init_x86(MpegEncContext *s) { const int dct_algo = s->avctx->dct_algo; - int i; - - for (i = 0; i < 64; i++) - inv_zigzag_direct16[ff_zigzag_direct[i]] = i + 1; if (dct_algo == FF_DCT_AUTO || dct_algo == FF_DCT_MMX) { #if HAVE_MMX_INLINE |