diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-14 18:24:56 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-14 18:25:04 +0100 |
| commit | 5e5d8ace8a7f58f702ec756b0909bd2ab27bd929 (patch) | |
| tree | f8b13de218d53796c89e7f690c7e6c80d20a7b90 | |
| parent | 722b48bc1256ebc91738a273f9738529810b08e8 (diff) | |
| parent | 36b822b8be7f9ecd6f9d87acaa786b128a873cd9 (diff) | |
| download | ffmpeg-5e5d8ace8a7f58f702ec756b0909bd2ab27bd929.tar.gz | |
Merge commit '36b822b8be7f9ecd6f9d87acaa786b128a873cd9'
* commit '36b822b8be7f9ecd6f9d87acaa786b128a873cd9':
arm: dsputil: Drop restrict keyword from add_pixels_clamped_armv6 prototype
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/arm/dsputil_init_armv6.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/arm/dsputil_init_armv6.c b/libavcodec/arm/dsputil_init_armv6.c index 5e9c177332..b72d32f65e 100644 --- a/libavcodec/arm/dsputil_init_armv6.c +++ b/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_add_armv6(uint8_t *dest, int line_size, int16_t *data); -void ff_add_pixels_clamped_armv6(const int16_t *block, - uint8_t *restrict pixels, +void ff_add_pixels_clamped_armv6(const int16_t *block, uint8_t *pixels, int line_size); void ff_get_pixels_armv6(int16_t *block, const uint8_t *pixels, int stride); |