diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2013-11-03 19:42:30 -0500 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-04 02:32:18 +0100 |
| commit | 6cf0c4107fbe665104b4a711a7772d4325009e15 (patch) | |
| tree | b434665070829edaaf95ea98ac683236a6fb993b | |
| parent | e1351662063d6aa9c0a04b869afc88b252155de8 (diff) | |
| download | ffmpeg-6cf0c4107fbe665104b4a711a7772d4325009e15.tar.gz | |
Put vp9_scans and vp9_scans_nb in ro_data.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/vp9.c | 4 | ||||
| -rw-r--r-- | libavcodec/vp9data.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c index 80bb9a515c..3539a548ef 100644 --- a/libavcodec/vp9.c +++ b/libavcodec/vp9.c @@ -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]; diff --git a/libavcodec/vp9data.h b/libavcodec/vp9data.h index d38365acac..625b60e10e 100644 --- a/libavcodec/vp9data.h +++ b/libavcodec/vp9data.h @@ -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 |