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/bfin | |
| parent | 5f49e92eb934d56fc1f031b579281ce48c251c4f (diff) | |
| parent | 9e0f14f16cfc9456a691655fda7d01090bffe47e (diff) | |
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/bfin')
| -rw-r--r-- | libavcodec/bfin/vp3_bfin.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/bfin/vp3_bfin.c b/libavcodec/bfin/vp3_bfin.c index 2647ba02f5..db6a691283 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); |