diff options
author | Martin Storsjö <martin@martin.st> | 2013-04-03 15:28:45 +0300 |
---|---|---|
committer | Martin Storsjö <martin@martin.st> | 2013-04-08 12:38:33 +0300 |
commit | 9e0f14f16cfc9456a691655fda7d01090bffe47e (patch) | |
tree | 3ed6da9561ea0bd3fabe9d154ee47de76ccd0c96 /libavcodec | |
parent | 18df366a1857f9a92e158858cf495b61d096c7f1 (diff) | |
download | ffmpeg-streaming-9e0f14f16cfc9456a691655fda7d01090bffe47e.zip ffmpeg-streaming-9e0f14f16cfc9456a691655fda7d01090bffe47e.tar.gz |
lavc: Make pointers to ff_cropTbl const
There's no point in these pointers not being const.
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/bfin/vp3_bfin.c | 2 | ||||
-rw-r--r-- | libavcodec/bit_depth_template.c | 2 | ||||
-rw-r--r-- | libavcodec/cavs.c | 2 | ||||
-rw-r--r-- | libavcodec/cavsdsp.c | 8 | ||||
-rw-r--r-- | libavcodec/dsputil.c | 12 | ||||
-rw-r--r-- | libavcodec/dvdsubdec.c | 2 | ||||
-rw-r--r-- | libavcodec/error_resilience.c | 4 | ||||
-rw-r--r-- | libavcodec/h264pred.c | 6 | ||||
-rw-r--r-- | libavcodec/imgconvert.c | 4 | ||||
-rw-r--r-- | libavcodec/rv30.c | 2 | ||||
-rw-r--r-- | libavcodec/rv30dsp.c | 12 | ||||
-rw-r--r-- | libavcodec/rv40dsp.c | 6 | ||||
-rw-r--r-- | libavcodec/sh4/dsputil_sh4.c | 4 | ||||
-rw-r--r-- | libavcodec/sh4/qpel.c | 12 | ||||
-rw-r--r-- | libavcodec/vp8dsp.c | 10 |
15 files changed, 44 insertions, 44 deletions
diff --git a/libavcodec/bfin/vp3_bfin.c b/libavcodec/bfin/vp3_bfin.c index ca6702b..ce8b033 100644 --- a/libavcodec/bfin/vp3_bfin.c +++ b/libavcodec/bfin/vp3_bfin.c @@ -30,7 +30,7 @@ /* Intra iDCT offset 128 */ static void bfin_vp3_idct_put(uint8_t *dest, int line_size, int16_t *block) { - uint8_t *cm = ff_cropTbl + MAX_NEG_CROP + 128; + const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP + 128; int i,j; ff_bfin_vp3_idct (block); diff --git a/libavcodec/bit_depth_template.c b/libavcodec/bit_depth_template.c index a757f45..37d02ad 100644 --- a/libavcodec/bit_depth_template.c +++ b/libavcodec/bit_depth_template.c @@ -70,7 +70,7 @@ # define pixel4 uint32_t # define dctcoef int16_t -# define INIT_CLIP uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; +# define INIT_CLIP const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; # define no_rnd_avg_pixel4 no_rnd_avg32 # define rnd_avg_pixel4 rnd_avg32 # define AV_RN2P AV_RN16 diff --git a/libavcodec/cavs.c b/libavcodec/cavs.c index abd4bac..47eaa0b 100644 --- a/libavcodec/cavs.c +++ b/libavcodec/cavs.c @@ -276,7 +276,7 @@ static void intra_pred_plane(uint8_t *d,uint8_t *top,uint8_t *left,int stride) int x, y, ia; int ih = 0; int iv = 0; - uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; + const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; for (x = 0; x < 4; x++) { ih += (x + 1) * (top [5 + x] - top [3 - x]); diff --git a/libavcodec/cavsdsp.c b/libavcodec/cavsdsp.c index e8494ec..70c8f35 100644 --- a/libavcodec/cavsdsp.c +++ b/libavcodec/cavsdsp.c @@ -186,7 +186,7 @@ static void cavs_filter_ch_c(uint8_t *d, int stride, int alpha, int beta, int tc static void cavs_idct8_add_c(uint8_t *dst, int16_t *block, int stride) { int i; int16_t (*src)[8] = (int16_t(*)[8])block; - uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; + const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; src[0][0] += 8; @@ -261,7 +261,7 @@ static void cavs_idct8_add_c(uint8_t *dst, int16_t *block, int stride) { #define CAVS_SUBPIX(OPNAME, OP, NAME, A, B, C, D, E, F) \ static void OPNAME ## cavs_filt8_h_ ## NAME(uint8_t *dst, uint8_t *src, int dstStride, int srcStride){\ const int h=8;\ - uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\ + const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\ int i;\ for(i=0; i<h; i++)\ {\ @@ -280,7 +280,7 @@ static void OPNAME ## cavs_filt8_h_ ## NAME(uint8_t *dst, uint8_t *src, int dstS \ static void OPNAME ## cavs_filt8_v_ ## NAME(uint8_t *dst, uint8_t *src, int dstStride, int srcStride){\ const int w=8;\ - uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\ + const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\ int i;\ for(i=0; i<w; i++)\ {\ @@ -334,7 +334,7 @@ static void OPNAME ## cavs_filt8_hv_ ## NAME(uint8_t *dst, uint8_t *src1, uint8_ int16_t *tmp = temp;\ const int h=8;\ const int w=8;\ - uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\ + const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\ int i;\ src1 -= 2*srcStride;\ for(i=0; i<h+5; i++)\ diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c index 7b7cdc8..35494a3 100644 --- a/libavcodec/dsputil.c +++ b/libavcodec/dsputil.c @@ -751,7 +751,7 @@ static inline void avg_tpel_pixels_mc22_c(uint8_t *dst, const uint8_t *src, int #define QPEL_MC(r, OPNAME, RND, OP) \ static void OPNAME ## mpeg4_qpel8_h_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride, int h){\ - uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\ + const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\ int i;\ for(i=0; i<h; i++)\ {\ @@ -770,7 +770,7 @@ static void OPNAME ## mpeg4_qpel8_h_lowpass(uint8_t *dst, uint8_t *src, int dstS \ static void OPNAME ## mpeg4_qpel8_v_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride){\ const int w=8;\ - uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\ + const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\ int i;\ for(i=0; i<w; i++)\ {\ @@ -797,7 +797,7 @@ static void OPNAME ## mpeg4_qpel8_v_lowpass(uint8_t *dst, uint8_t *src, int dstS }\ \ static void OPNAME ## mpeg4_qpel16_h_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride, int h){\ - uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\ + const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\ int i;\ \ for(i=0; i<h; i++)\ @@ -824,7 +824,7 @@ static void OPNAME ## mpeg4_qpel16_h_lowpass(uint8_t *dst, uint8_t *src, int dst }\ \ static void OPNAME ## mpeg4_qpel16_v_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride){\ - uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\ + const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\ int i;\ const int w=16;\ for(i=0; i<w; i++)\ @@ -1289,7 +1289,7 @@ QPEL_MC(0, avg_ , _ , op_avg) #define put_no_rnd_qpel16_mc00_c ff_put_pixels16x16_8_c static void wmv2_mspel8_h_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride, int h){ - uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; + const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; int i; for(i=0; i<h; i++){ @@ -1326,7 +1326,7 @@ void ff_avg_rv40_qpel8_mc33_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride) #endif /* CONFIG_RV40_DECODER */ static void wmv2_mspel8_v_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride, int w){ - uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; + const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; int i; for(i=0; i<w; i++){ diff --git a/libavcodec/dvdsubdec.c b/libavcodec/dvdsubdec.c index ae16f05..cf4524e 100644 --- a/libavcodec/dvdsubdec.c +++ b/libavcodec/dvdsubdec.c @@ -34,7 +34,7 @@ typedef struct DVDSubContext { static void yuv_a_to_rgba(const uint8_t *ycbcr, const uint8_t *alpha, uint32_t *rgba, int num_values) { - uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; + const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; uint8_t r, g, b; int i, y, cb, cr; int r_add, g_add, b_add; diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c index feef3a8..4834b22 100644 --- a/libavcodec/error_resilience.c +++ b/libavcodec/error_resilience.c @@ -219,7 +219,7 @@ static void h_block_filter(ERContext *s, uint8_t *dst, int w, int h, int stride, int is_luma) { int b_x, b_y, mvx_stride, mvy_stride; - uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; + const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; set_mv_strides(s, &mvx_stride, &mvy_stride); mvx_stride >>= is_luma; mvy_stride *= mvx_stride; @@ -287,7 +287,7 @@ static void v_block_filter(ERContext *s, uint8_t *dst, int w, int h, int stride, int is_luma) { int b_x, b_y, mvx_stride, mvy_stride; - uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; + const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; set_mv_strides(s, &mvx_stride, &mvy_stride); mvx_stride >>= is_luma; mvy_stride *= mvx_stride; diff --git a/libavcodec/h264pred.c b/libavcodec/h264pred.c index 15f2112..07aa2ae 100644 --- a/libavcodec/h264pred.c +++ b/libavcodec/h264pred.c @@ -268,7 +268,7 @@ static void pred4x4_horizontal_up_rv40_nodown_c(uint8_t *src, static void pred4x4_tm_vp8_c(uint8_t *src, const uint8_t *topright, ptrdiff_t stride) { - uint8_t *cm = ff_cropTbl + MAX_NEG_CROP - src[-1-stride]; + const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP - src[-1-stride]; uint8_t *top = src-stride; int y; @@ -294,7 +294,7 @@ static void pred16x16_plane_rv40_c(uint8_t *src, ptrdiff_t stride) static void pred16x16_tm_vp8_c(uint8_t *src, ptrdiff_t stride) { - uint8_t *cm = ff_cropTbl + MAX_NEG_CROP - src[-1-stride]; + const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP - src[-1-stride]; uint8_t *top = src-stride; int y; @@ -376,7 +376,7 @@ static void pred8x8_dc_rv40_c(uint8_t *src, ptrdiff_t stride) static void pred8x8_tm_vp8_c(uint8_t *src, ptrdiff_t stride) { - uint8_t *cm = ff_cropTbl + MAX_NEG_CROP - src[-1-stride]; + const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP - src[-1-stride]; uint8_t *top = src-stride; int y; diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c index d62c9c1..646fb85 100644 --- a/libavcodec/imgconvert.c +++ b/libavcodec/imgconvert.c @@ -358,7 +358,7 @@ static void deinterlace_line_c(uint8_t *dst, const uint8_t *lum, int size) { - uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; + const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; int sum; for(;size > 0;size--) { @@ -381,7 +381,7 @@ static void deinterlace_line_inplace_c(uint8_t *lum_m4, uint8_t *lum_m3, uint8_t *lum_m2, uint8_t *lum_m1, uint8_t *lum, int size) { - uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; + const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; int sum; for(;size > 0;size--) { diff --git a/libavcodec/rv30.c b/libavcodec/rv30.c index 32f523b..f1f33c5 100644 --- a/libavcodec/rv30.c +++ b/libavcodec/rv30.c @@ -119,7 +119,7 @@ static int rv30_decode_mb_info(RV34DecContext *r) static inline void rv30_weak_loop_filter(uint8_t *src, const int step, const int stride, const int lim) { - uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; + const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; int i, diff; for(i = 0; i < 4; i++){ diff --git a/libavcodec/rv30dsp.c b/libavcodec/rv30dsp.c index 9446df9..d4b122e 100644 --- a/libavcodec/rv30dsp.c +++ b/libavcodec/rv30dsp.c @@ -32,7 +32,7 @@ #define RV30_LOWPASS(OPNAME, OP) \ static av_unused void OPNAME ## rv30_tpel8_h_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride, const int C1, const int C2){\ const int h = 8;\ - uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\ + const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\ int i;\ for(i = 0; i < h; i++)\ {\ @@ -51,7 +51,7 @@ static av_unused void OPNAME ## rv30_tpel8_h_lowpass(uint8_t *dst, uint8_t *src, \ static void OPNAME ## rv30_tpel8_v_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride, const int C1, const int C2){\ const int w = 8;\ - uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\ + const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\ int i;\ for(i = 0; i < w; i++)\ {\ @@ -82,7 +82,7 @@ static void OPNAME ## rv30_tpel8_v_lowpass(uint8_t *dst, uint8_t *src, int dstSt static void OPNAME ## rv30_tpel8_hv_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride){\ const int w = 8;\ const int h = 8;\ - uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\ + const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\ int i, j;\ for(j = 0; j < h; j++){\ for(i = 0; i < w; i++){\ @@ -101,7 +101,7 @@ static void OPNAME ## rv30_tpel8_hv_lowpass(uint8_t *dst, uint8_t *src, int dstS static void OPNAME ## rv30_tpel8_hhv_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride){\ const int w = 8;\ const int h = 8;\ - uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\ + const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\ int i, j;\ for(j = 0; j < h; j++){\ for(i = 0; i < w; i++){\ @@ -120,7 +120,7 @@ static void OPNAME ## rv30_tpel8_hhv_lowpass(uint8_t *dst, uint8_t *src, int dst static void OPNAME ## rv30_tpel8_hvv_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride){\ const int w = 8;\ const int h = 8;\ - uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\ + const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\ int i, j;\ for(j = 0; j < h; j++){\ for(i = 0; i < w; i++){\ @@ -139,7 +139,7 @@ static void OPNAME ## rv30_tpel8_hvv_lowpass(uint8_t *dst, uint8_t *src, int dst static void OPNAME ## rv30_tpel8_hhvv_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride){\ const int w = 8;\ const int h = 8;\ - uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\ + const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\ int i, j;\ for(j = 0; j < h; j++){\ for(i = 0; i < w; i++){\ diff --git a/libavcodec/rv40dsp.c b/libavcodec/rv40dsp.c index 20f075d..b63d238 100644 --- a/libavcodec/rv40dsp.c +++ b/libavcodec/rv40dsp.c @@ -32,7 +32,7 @@ #define RV40_LOWPASS(OPNAME, OP) \ static av_unused void OPNAME ## rv40_qpel8_h_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride,\ const int h, const int C1, const int C2, const int SHIFT){\ - uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\ + const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\ int i;\ for(i = 0; i < h; i++)\ {\ @@ -51,7 +51,7 @@ static av_unused void OPNAME ## rv40_qpel8_h_lowpass(uint8_t *dst, uint8_t *src, \ static void OPNAME ## rv40_qpel8_v_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride,\ const int w, const int C1, const int C2, const int SHIFT){\ - uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\ + const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\ int i;\ for(i = 0; i < w; i++)\ {\ @@ -350,7 +350,7 @@ static av_always_inline void rv40_weak_loop_filter(uint8_t *src, const int lim_q1, const int lim_p1) { - uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; + const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; int i, t, u, diff; for (i = 0; i < 4; i++, src += stride) { diff --git a/libavcodec/sh4/dsputil_sh4.c b/libavcodec/sh4/dsputil_sh4.c index bd2b182..2538945 100644 --- a/libavcodec/sh4/dsputil_sh4.c +++ b/libavcodec/sh4/dsputil_sh4.c @@ -56,7 +56,7 @@ static void clear_blocks_sh4(int16_t *blocks) static void idct_put(uint8_t *dest, int line_size, int16_t *block) { int i; - uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; + const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; ff_idct_sh4(block); for(i=0;i<8;i++) { dest[0] = cm[block[0]]; @@ -74,7 +74,7 @@ static void idct_put(uint8_t *dest, int line_size, int16_t *block) static void idct_add(uint8_t *dest, int line_size, int16_t *block) { int i; - uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; + const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; ff_idct_sh4(block); for(i=0;i<8;i++) { dest[0] = cm[dest[0]+block[0]]; diff --git a/libavcodec/sh4/qpel.c b/libavcodec/sh4/qpel.c index 5fa4141..d3de484 100644 --- a/libavcodec/sh4/qpel.c +++ b/libavcodec/sh4/qpel.c @@ -363,7 +363,7 @@ static void gmc1_c(uint8_t *dst, uint8_t *src, int stride, int h, int x16, int y #define QPEL_MC(r, OPNAME, RND, OP) \ static void OPNAME ## mpeg4_qpel8_h_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride, int h){\ - uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\ + const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\ do {\ uint8_t *s = src; \ int src0,src1,src2,src3,src4,src5,src6,src7,src8;\ @@ -390,7 +390,7 @@ static void OPNAME ## mpeg4_qpel8_h_lowpass(uint8_t *dst, uint8_t *src, int dstS }\ \ static void OPNAME ## mpeg4_qpel8_v_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride){\ - uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\ + const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\ int w=8;\ do{\ uint8_t *s = src, *d=dst;\ @@ -418,7 +418,7 @@ static void OPNAME ## mpeg4_qpel8_v_lowpass(uint8_t *dst, uint8_t *src, int dstS }\ \ static void OPNAME ## mpeg4_qpel16_h_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride, int h){\ - uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\ + const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\ do {\ uint8_t *s = src;\ int src0,src1,src2,src3,src4,src5,src6,src7,src8;\ @@ -462,7 +462,7 @@ static void OPNAME ## mpeg4_qpel16_h_lowpass(uint8_t *dst, uint8_t *src, int dst }\ \ static void OPNAME ## mpeg4_qpel16_v_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride){\ - uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\ + const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\ int w=16;\ do {\ uint8_t *s = src, *d=dst;\ @@ -754,7 +754,7 @@ QPEL_MC(0, avg_ , _ , op_avg) #undef op_put_no_rnd static void wmv2_mspel8_h_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride, int h){ - uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; + const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; do{ int src_1,src0,src1,src2,src3,src4,src5,src6,src7,src8,src9; @@ -784,7 +784,7 @@ static void wmv2_mspel8_h_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int } static void wmv2_mspel8_v_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride, int w){ - uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; + const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; do{ int src_1,src0,src1,src2,src3,src4,src5,src6,src7,src8,src9; diff --git a/libavcodec/vp8dsp.c b/libavcodec/vp8dsp.c index 4b7782f..78c9b12 100644 --- a/libavcodec/vp8dsp.c +++ b/libavcodec/vp8dsp.c @@ -160,7 +160,7 @@ static av_always_inline void filter_common(uint8_t *p, ptrdiff_t stride, int is4 { LOAD_PIXELS int a, f1, f2; - uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; + const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; a = 3*(q0 - p0); @@ -215,7 +215,7 @@ static av_always_inline int hev(uint8_t *p, ptrdiff_t stride, int thresh) static av_always_inline void filter_mbedge(uint8_t *p, ptrdiff_t stride) { int a0, a1, a2, w; - uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; + const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; LOAD_PIXELS @@ -337,7 +337,7 @@ PUT_PIXELS(4) static void put_vp8_epel ## SIZE ## _h ## TAPS ## _c(uint8_t *dst, ptrdiff_t dststride, uint8_t *src, ptrdiff_t srcstride, int h, int mx, int my) \ { \ const uint8_t *filter = subpel_filters[mx-1]; \ - uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; \ + const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; \ int x, y; \ \ for (y = 0; y < h; y++) { \ @@ -351,7 +351,7 @@ static void put_vp8_epel ## SIZE ## _h ## TAPS ## _c(uint8_t *dst, ptrdiff_t dst static void put_vp8_epel ## SIZE ## _v ## TAPS ## _c(uint8_t *dst, ptrdiff_t dststride, uint8_t *src, ptrdiff_t srcstride, int h, int mx, int my) \ { \ const uint8_t *filter = subpel_filters[my-1]; \ - uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; \ + const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; \ int x, y; \ \ for (y = 0; y < h; y++) { \ @@ -365,7 +365,7 @@ static void put_vp8_epel ## SIZE ## _v ## TAPS ## _c(uint8_t *dst, ptrdiff_t dst static void put_vp8_epel ## SIZE ## _h ## HTAPS ## v ## VTAPS ## _c(uint8_t *dst, ptrdiff_t dststride, uint8_t *src, ptrdiff_t srcstride, int h, int mx, int my) \ { \ const uint8_t *filter = subpel_filters[mx-1]; \ - uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; \ + const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; \ int x, y; \ uint8_t tmp_array[(2*SIZE+VTAPS-1)*SIZE]; \ uint8_t *tmp = tmp_array; \ |