diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-08 14:47:49 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-08 14:47:49 +0400 |
| commit | 024a5f72eec54b9a3fcaa6fc568ae1e21ac0a6a6 (patch) | |
| tree | dc8b9841d15035432678b76cd438ecdd9ba7b55f /libavcodec/imgconvert.c | |
| 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/imgconvert.c')
| -rw-r--r-- | libavcodec/imgconvert.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c index cf3c9677f9..616cf78013 100644 --- a/libavcodec/imgconvert.c +++ b/libavcodec/imgconvert.c @@ -483,7 +483,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--) { @@ -506,7 +506,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--) { |