RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Put vp9_scans and vp9_scans_nb in ro_data. 

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Ronald S. Bultje 2013-11-03 19:42:30 -05:00 committed by Michael Niedermayer
parent e135166206
commit 6cf0c4107f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/vp9.c
View File

@ -1904,8 +1904,8 @@ static int decode_coeffs(AVCodecContext *ctx)
int uvstep1d = 1 << b->uvtx, uvstep = 1 << (b->uvtx * 2), res;
int16_t (*qmul)[2] = s->segmentation.feat[b->seg_id].qmul;
int tx = 4 * s->lossless + b->tx;
const int16_t **yscans = vp9_scans[tx];
const int16_t (**ynbs)[2] = vp9_scans_nb[tx];
const int16_t * const *yscans = vp9_scans[tx];
const int16_t (* const *ynbs)[2] = vp9_scans_nb[tx];
const int16_t *uvscan = vp9_scans[b->uvtx][DCT_DCT];
const int16_t (*uvnb)[2] = vp9_scans_nb[b->uvtx][DCT_DCT];
uint8_t *a = &s->above_y_nnz_ctx[col * 2];

4
libavcodec/vp9data.h
View File

@ -469,7 +469,7 @@ static const int16_t vp9_default_scan_32x32[1024] = {
923, 954, 985, 1016, 831, 862, 893, 955, 986, 1017, 863, 894, 987, 1018, 895, 1019, 924, 925, 956, 926, 957, 988, 927, 958, 989, 1020, 959, 990, 1021, 991, 1022, 1023,
};
static const int16_t *vp9_scans[5][4] = {
static const int16_t * const vp9_scans[5][4] = {
{
vp9_default_scan_4x4, vp9_col_scan_4x4,
vp9_row_scan_4x4, vp9_default_scan_4x4
@ -1026,7 +1026,7 @@ static const int16_t vp9_default_scan_32x32_nb[1024][2] = {
{ 990, 959 }, { 1021, 990 }, { 1022, 991 }, { 0, 0 },
};
static const int16_t (*vp9_scans_nb[5][4])[2] = {
static const int16_t (* const vp9_scans_nb[5][4])[2] = {
{
vp9_default_scan_4x4_nb, vp9_col_scan_4x4_nb,
vp9_row_scan_4x4_nb, vp9_default_scan_4x4_nb