diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2012-09-07 09:39:12 -0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-09 03:55:56 +0200 |
| commit | e62e455f7b4c5b148f5a289ba823dcc71d6ca389 (patch) | |
| tree | 9d7767b8fca714cc861e8adce6fd8b65aa43d319 /libavcodec/alpha | |
| parent | d48ebfbdea50d7f3a4e61e772b92960ff7b8d4ea (diff) | |
| download | ffmpeg-e62e455f7b4c5b148f5a289ba823dcc71d6ca389.tar.gz | |
dsputil/me/pixels: Actually use av_restrict
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/alpha')
| -rw-r--r-- | libavcodec/alpha/dsputil_alpha.c | 4 | ||||
| -rw-r--r-- | libavcodec/alpha/dsputil_alpha.h | 4 | ||||
| -rw-r--r-- | libavcodec/alpha/motion_est_alpha.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/alpha/dsputil_alpha.c b/libavcodec/alpha/dsputil_alpha.c index db2464b02f..38ac0209a8 100644 --- a/libavcodec/alpha/dsputil_alpha.c +++ b/libavcodec/alpha/dsputil_alpha.c @@ -211,7 +211,7 @@ static inline uint64_t avg4(uint64_t l1, uint64_t l2, uint64_t l3, uint64_t l4) #define MAKE_OP(OPNAME, SUFF, OPKIND, STORE) \ static void OPNAME ## _pixels ## SUFF ## _axp \ - (uint8_t *restrict block, const uint8_t *restrict pixels, \ + (uint8_t *av_restrict block, const uint8_t *av_restrict pixels, \ int line_size, int h) \ { \ if ((size_t) pixels & 0x7) { \ @@ -222,7 +222,7 @@ static void OPNAME ## _pixels ## SUFF ## _axp \ } \ \ static void OPNAME ## _pixels16 ## SUFF ## _axp \ - (uint8_t *restrict block, const uint8_t *restrict pixels, \ + (uint8_t *av_restrict block, const uint8_t *av_restrict pixels, \ int line_size, int h) \ { \ OPNAME ## _pixels ## SUFF ## _axp(block, pixels, line_size, h); \ diff --git a/libavcodec/alpha/dsputil_alpha.h b/libavcodec/alpha/dsputil_alpha.h index a3fa3dd586..4bc09a497d 100644 --- a/libavcodec/alpha/dsputil_alpha.h +++ b/libavcodec/alpha/dsputil_alpha.h @@ -36,8 +36,8 @@ extern void (*put_pixels_clamped_axp_p)(const DCTELEM *block, uint8_t *pixels, extern void (*add_pixels_clamped_axp_p)(const DCTELEM *block, uint8_t *pixels, int line_size); -void get_pixels_mvi(DCTELEM *restrict block, - const uint8_t *restrict pixels, int line_size); +void get_pixels_mvi(DCTELEM *av_restrict block, + const uint8_t *av_restrict pixels, int line_size); void diff_pixels_mvi(DCTELEM *block, const uint8_t *s1, const uint8_t *s2, int stride); int pix_abs8x8_mvi(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h); diff --git a/libavcodec/alpha/motion_est_alpha.c b/libavcodec/alpha/motion_est_alpha.c index 863dd23da3..927b25d992 100644 --- a/libavcodec/alpha/motion_est_alpha.c +++ b/libavcodec/alpha/motion_est_alpha.c @@ -23,8 +23,8 @@ #include "dsputil_alpha.h" #include "asm.h" -void get_pixels_mvi(DCTELEM *restrict block, - const uint8_t *restrict pixels, int line_size) +void get_pixels_mvi(DCTELEM *av_restrict block, + const uint8_t *av_restrict pixels, int line_size) { int h = 8; |