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/x86/rv40dsp_init.c | |
| parent | 937eaba2a1159225aeef694d9b2e72d9eff0c8da (diff) | |
| parent | 7fb993d338d88f2f62e0a358b6c9f3eb9a3a08ac (diff) | |
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/x86/rv40dsp_init.c')
| -rw-r--r-- | libavcodec/x86/rv40dsp_init.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/x86/rv40dsp_init.c b/libavcodec/x86/rv40dsp_init.c index 209c3c4a1b..2900e2d2d3 100644 --- a/libavcodec/x86/rv40dsp_init.c +++ b/libavcodec/x86/rv40dsp_init.c @@ -33,7 +33,7 @@ #include "hpeldsp.h" #define DEFINE_FN(op, size, insn) \ -static void op##_rv40_qpel##size##_mc33_##insn(uint8_t *dst, uint8_t *src, \ +static void op##_rv40_qpel##size##_mc33_##insn(uint8_t *dst, const uint8_t *src, \ ptrdiff_t stride) \ { \ ff_##op##_pixels##size##_xy2_##insn(dst, src, stride, size); \ @@ -77,7 +77,7 @@ DECLARE_WEIGHT(ssse3) */ #define QPEL_FUNC_DECL(OP, SIZE, PH, PV, OPT) \ static void OP ## rv40_qpel ##SIZE ##_mc ##PH ##PV ##OPT(uint8_t *dst, \ - uint8_t *src, \ + const uint8_t *src, \ ptrdiff_t stride) \ { \ int i; \ |