diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-25 14:58:03 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-25 15:05:08 +0400 |
| commit | 2904d052b7ca8714fda5c039c958bc0a0ae40877 (patch) | |
| tree | 7124a278835635a85ce1f180aa1cdd66eb9c0c6d /libavcodec/qpeldsp.h | |
| 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/qpeldsp.h')
| -rw-r--r-- | libavcodec/qpeldsp.h | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/libavcodec/qpeldsp.h b/libavcodec/qpeldsp.h index 94caf6ffc2..b51420a6a2 100644 --- a/libavcodec/qpeldsp.h +++ b/libavcodec/qpeldsp.h @@ -29,22 +29,25 @@ #include <stddef.h> #include <stdint.h> -void ff_put_pixels8x8_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride); -void ff_avg_pixels8x8_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride); -void ff_put_pixels16x16_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride); -void ff_avg_pixels16x16_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride); +void ff_put_pixels8x8_c(uint8_t *dst, const uint8_t *src, ptrdiff_t stride); +void ff_avg_pixels8x8_c(uint8_t *dst, const uint8_t *src, ptrdiff_t stride); +void ff_put_pixels16x16_c(uint8_t *dst, const uint8_t *src, ptrdiff_t stride); +void ff_avg_pixels16x16_c(uint8_t *dst, const uint8_t *src, ptrdiff_t stride); void ff_put_pixels8_l2_8(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, int dst_stride, int src_stride1, int src_stride2, int h); -#define DEF_OLD_QPEL(name) \ - void ff_put_ ## name(uint8_t *dst /* align width (8 or 16) */, \ - uint8_t *src /* align 1 */, ptrdiff_t stride); \ - void ff_put_no_rnd_ ## name(uint8_t *dst /* align width (8 or 16) */, \ - uint8_t *src /* align 1 */, ptrdiff_t stride); \ - void ff_avg_ ## name(uint8_t *dst /* align width (8 or 16) */, \ - uint8_t *src /* align 1 */, ptrdiff_t stride); +#define DEF_OLD_QPEL(name) \ +void ff_put_ ## name(uint8_t *dst /* align width (8 or 16) */, \ + const uint8_t *src /* align 1 */, \ + ptrdiff_t stride); \ +void ff_put_no_rnd_ ## name(uint8_t *dst /* align width (8 or 16) */, \ + const uint8_t *src /* align 1 */, \ + ptrdiff_t stride); \ +void ff_avg_ ## name(uint8_t *dst /* align width (8 or 16) */, \ + const uint8_t *src /* align 1 */, \ + ptrdiff_t stride); DEF_OLD_QPEL(qpel16_mc11_old_c) DEF_OLD_QPEL(qpel16_mc31_old_c) @@ -60,7 +63,8 @@ DEF_OLD_QPEL(qpel8_mc13_old_c) DEF_OLD_QPEL(qpel8_mc33_old_c) typedef void (*qpel_mc_func)(uint8_t *dst /* align width (8 or 16) */, - uint8_t *src /* align 1 */, ptrdiff_t stride); + const uint8_t *src /* align 1 */, + ptrdiff_t stride); /** * quarterpel DSP context |