diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-03-12 04:35:06 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-03-12 04:35:06 +0100 |
| commit | 1c27359867cfd6b3a8f0d3d03144f183ccda694b (patch) | |
| tree | cd72985372a9e203b051b382c0c35e5d569e3b2f /libavcodec/mpcdata.h | |
| parent | 00969376cefda9c733217bff139f911c24b16deb (diff) | |
| parent | c95fefa0420be9cc0f09a95041acf11114aaacd0 (diff) | |
| download | ffmpeg-1c27359867cfd6b3a8f0d3d03144f183ccda694b.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
dsicinvideo: validate buffer offset before copying pixels.
cook: error out on quant_index values outside [-63, 63] range.
mpc: pad mpc_CC/SCF[] tables to allow for negative indices.
Conflicts:
libavcodec/cook.c
libavcodec/dsicinav.c
libavcodec/mpc.c
libavcodec/mpc7.c
libavcodec/mpcdata.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpcdata.h')
| -rw-r--r-- | libavcodec/mpcdata.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavcodec/mpcdata.h b/libavcodec/mpcdata.h index b9bc423be8..64fb4ab326 100644 --- a/libavcodec/mpcdata.h +++ b/libavcodec/mpcdata.h @@ -22,9 +22,10 @@ #ifndef AVCODEC_MPCDATA_H #define AVCODEC_MPCDATA_H -static const float mpc_CC[1+18] = { - 111.285962475327f, - 65536.0000, 21845.3333, 13107.2000, 9362.2857, 7281.7778, 4369.0667, 2114.0645, +static const float mpc_CC[18+1] = { + 111.285962475327f, // 32768/2/255*sqrt(3) + 65536.0000 /* this value is never used */, + 21845.3333, 13107.2000, 9362.2857, 7281.7778, 4369.0667, 2114.0645, 1040.2539, 516.0315, 257.0039, 128.2505, 64.0626, 32.0156, 16.0039, 8.0010, 4.0002, 2.0001, 1.0000 }; |