diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-25 12:58:03 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-25 13:05:08 +0200 |
| commit | 2904d052b7ca8714fda5c039c958bc0a0ae40877 (patch) | |
| tree | 7124a278835635a85ce1f180aa1cdd66eb9c0c6d /libavcodec/wmv2dsp.c | |
| parent | 937eaba2a1159225aeef694d9b2e72d9eff0c8da (diff) | |
| parent | 7fb993d338d88f2f62e0a358b6c9f3eb9a3a08ac (diff) | |
| download | ffmpeg-2904d052b7ca8714fda5c039c958bc0a0ae40877.tar.gz | |
Merge commit '7fb993d338d88f2f62e0a358b6c9f3eb9a3a08ac'
* commit '7fb993d338d88f2f62e0a358b6c9f3eb9a3a08ac':
qpeldsp: Mark source pointer in qpel_mc_func function pointer const
Conflicts:
libavcodec/h264qpel_template.c
libavcodec/x86/cavsdsp.c
libavcodec/x86/rv40dsp_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/wmv2dsp.c')
| -rw-r--r-- | libavcodec/wmv2dsp.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libavcodec/wmv2dsp.c b/libavcodec/wmv2dsp.c index 70a22c66a8..40e0bef0da 100644 --- a/libavcodec/wmv2dsp.c +++ b/libavcodec/wmv2dsp.c @@ -139,7 +139,7 @@ static void wmv2_idct_put_c(uint8_t *dest, int line_size, int16_t *block) } } -static void wmv2_mspel8_h_lowpass(uint8_t *dst, uint8_t *src, +static void wmv2_mspel8_h_lowpass(uint8_t *dst, const uint8_t *src, int dstStride, int srcStride, int h) { const uint8_t *cm = ff_crop_tab + MAX_NEG_CROP; @@ -159,7 +159,7 @@ static void wmv2_mspel8_h_lowpass(uint8_t *dst, uint8_t *src, } } -static void wmv2_mspel8_v_lowpass(uint8_t *dst, uint8_t *src, +static void wmv2_mspel8_v_lowpass(uint8_t *dst, const uint8_t *src, int dstStride, int srcStride, int w) { const uint8_t *cm = ff_crop_tab + MAX_NEG_CROP; @@ -190,7 +190,7 @@ static void wmv2_mspel8_v_lowpass(uint8_t *dst, uint8_t *src, } } -static void put_mspel8_mc10_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride) +static void put_mspel8_mc10_c(uint8_t *dst, const uint8_t *src, ptrdiff_t stride) { uint8_t half[64]; @@ -198,12 +198,12 @@ static void put_mspel8_mc10_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride) ff_put_pixels8_l2_8(dst, src, half, stride, stride, 8, 8); } -static void put_mspel8_mc20_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride) +static void put_mspel8_mc20_c(uint8_t *dst, const uint8_t *src, ptrdiff_t stride) { wmv2_mspel8_h_lowpass(dst, src, stride, stride, 8); } -static void put_mspel8_mc30_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride) +static void put_mspel8_mc30_c(uint8_t *dst, const uint8_t *src, ptrdiff_t stride) { uint8_t half[64]; @@ -211,12 +211,12 @@ static void put_mspel8_mc30_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride) ff_put_pixels8_l2_8(dst, src + 1, half, stride, stride, 8, 8); } -static void put_mspel8_mc02_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride) +static void put_mspel8_mc02_c(uint8_t *dst, const uint8_t *src, ptrdiff_t stride) { wmv2_mspel8_v_lowpass(dst, src, stride, stride, 8); } -static void put_mspel8_mc12_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride) +static void put_mspel8_mc12_c(uint8_t *dst, const uint8_t *src, ptrdiff_t stride) { uint8_t halfH[88]; uint8_t halfV[64]; @@ -228,7 +228,7 @@ static void put_mspel8_mc12_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride) ff_put_pixels8_l2_8(dst, halfV, halfHV, stride, 8, 8, 8); } -static void put_mspel8_mc32_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride) +static void put_mspel8_mc32_c(uint8_t *dst, const uint8_t *src, ptrdiff_t stride) { uint8_t halfH[88]; uint8_t halfV[64]; @@ -240,7 +240,7 @@ static void put_mspel8_mc32_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride) ff_put_pixels8_l2_8(dst, halfV, halfHV, stride, 8, 8, 8); } -static void put_mspel8_mc22_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride) +static void put_mspel8_mc22_c(uint8_t *dst, const uint8_t *src, ptrdiff_t stride) { uint8_t halfH[88]; |