diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-08 12:47:49 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-08 12:47:49 +0200 |
| commit | 024a5f72eec54b9a3fcaa6fc568ae1e21ac0a6a6 (patch) | |
| tree | dc8b9841d15035432678b76cd438ecdd9ba7b55f /libavcodec/sh4 | |
| parent | 5f49e92eb934d56fc1f031b579281ce48c251c4f (diff) | |
| parent | 9e0f14f16cfc9456a691655fda7d01090bffe47e (diff) | |
| download | ffmpeg-024a5f72eec54b9a3fcaa6fc568ae1e21ac0a6a6.tar.gz | |
Merge commit '9e0f14f16cfc9456a691655fda7d01090bffe47e'
* commit '9e0f14f16cfc9456a691655fda7d01090bffe47e':
lavc: Make pointers to ff_cropTbl const
vp3: Embed idct_permutation array directly in VP3DecoderContext
Conflicts:
libavcodec/bit_depth_template.c
libavcodec/vp3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/sh4')
| -rw-r--r-- | libavcodec/sh4/dsputil_sh4.c | 4 | ||||
| -rw-r--r-- | libavcodec/sh4/qpel.c | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/libavcodec/sh4/dsputil_sh4.c b/libavcodec/sh4/dsputil_sh4.c index 6e19fa0958..3d0baf8575 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 1a5a4cd88d..2675f12a81 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; |