Merge commit '36b822b8be7f9ecd6f9d87acaa786b128a873cd9'

* commit '36b822b8be7f9ecd6f9d87acaa786b128a873cd9':
  arm: dsputil: Drop restrict keyword from add_pixels_clamped_armv6 prototype

Merged-by: Michael Niedermayer <michaelni@gmx.at>
pull/293/head
Michael Niedermayer 11 years ago
commit 5e5d8ace8a
  1. 3
      libavcodec/arm/dsputil_init_armv6.c

@ -29,8 +29,7 @@ void ff_simple_idct_armv6(int16_t *data);
void ff_simple_idct_put_armv6(uint8_t *dest, int line_size, int16_t *data); void ff_simple_idct_put_armv6(uint8_t *dest, int line_size, int16_t *data);
void ff_simple_idct_add_armv6(uint8_t *dest, int line_size, int16_t *data); void ff_simple_idct_add_armv6(uint8_t *dest, int line_size, int16_t *data);
void ff_add_pixels_clamped_armv6(const int16_t *block, void ff_add_pixels_clamped_armv6(const int16_t *block, uint8_t *pixels,
uint8_t *restrict pixels,
int line_size); int line_size);
void ff_get_pixels_armv6(int16_t *block, const uint8_t *pixels, int stride); void ff_get_pixels_armv6(int16_t *block, const uint8_t *pixels, int stride);

Loading…
Cancel
Save