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/ppc/h264qpel_template.c | |
| parent | 937eaba2a1159225aeef694d9b2e72d9eff0c8da (diff) | |
| parent | 7fb993d338d88f2f62e0a358b6c9f3eb9a3a08ac (diff) | |
| download | ffmpeg-streaming-2904d052b7ca8714fda5c039c958bc0a0ae40877.zip ffmpeg-streaming-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/ppc/h264qpel_template.c')
| -rw-r--r-- | libavcodec/ppc/h264qpel_template.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/libavcodec/ppc/h264qpel_template.c b/libavcodec/ppc/h264qpel_template.c index cfc4560..360e9e3 100644 --- a/libavcodec/ppc/h264qpel_template.c +++ b/libavcodec/ppc/h264qpel_template.c @@ -28,7 +28,10 @@ /* this code assume stride % 16 == 0 */ #ifdef PREFIX_h264_qpel16_h_lowpass_altivec -static void PREFIX_h264_qpel16_h_lowpass_altivec(uint8_t * dst, uint8_t * src, int dstStride, int srcStride) { +static void PREFIX_h264_qpel16_h_lowpass_altivec(uint8_t *dst, + const uint8_t *src, + int dstStride, int srcStride) +{ register int i; LOAD_ZERO; @@ -168,7 +171,10 @@ static void PREFIX_h264_qpel16_h_lowpass_altivec(uint8_t * dst, uint8_t * src, i /* this code assume stride % 16 == 0 */ #ifdef PREFIX_h264_qpel16_v_lowpass_altivec -static void PREFIX_h264_qpel16_v_lowpass_altivec(uint8_t * dst, uint8_t * src, int dstStride, int srcStride) { +static void PREFIX_h264_qpel16_v_lowpass_altivec(uint8_t *dst, + const uint8_t *src, + int dstStride, int srcStride) +{ register int i; LOAD_ZERO; @@ -178,7 +184,7 @@ static void PREFIX_h264_qpel16_v_lowpass_altivec(uint8_t * dst, uint8_t * src, i const vec_s16 v5ss = vec_splat_s16(5); const vec_s16 v16ss = vec_sl(vec_splat_s16(1),vec_splat_u16(4)); - uint8_t *srcbis = src - (srcStride * 2); + const uint8_t *srcbis = src - (srcStride * 2); const vec_u8 srcM2a = vec_ld(0, srcbis); const vec_u8 srcM2b = vec_ld(16, srcbis); @@ -275,7 +281,11 @@ static void PREFIX_h264_qpel16_v_lowpass_altivec(uint8_t * dst, uint8_t * src, i /* this code assume stride % 16 == 0 *and* tmp is properly aligned */ #ifdef PREFIX_h264_qpel16_hv_lowpass_altivec -static void PREFIX_h264_qpel16_hv_lowpass_altivec(uint8_t * dst, int16_t * tmp, uint8_t * src, int dstStride, int tmpStride, int srcStride) { +static void PREFIX_h264_qpel16_hv_lowpass_altivec(uint8_t *dst, int16_t *tmp, + const uint8_t *src, + int dstStride, int tmpStride, + int srcStride) +{ register int i; LOAD_ZERO; const vec_u8 permM2 = vec_lvsl(-2, src); |
