summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2014-03-14 13:22:50 +0100
committerDiego Biurrun <diego@biurrun.de>2014-03-14 13:45:40 +0100
commit36b822b8be7f9ecd6f9d87acaa786b128a873cd9 (patch)
treea24677af2e6cb0ee6d682a4ab19f66299111c145
parentafdf94689c4e462bcf886f6ad68eac736eb1b95a (diff)
downloadffmpeg-streaming-36b822b8be7f9ecd6f9d87acaa786b128a873cd9.zip
ffmpeg-streaming-36b822b8be7f9ecd6f9d87acaa786b128a873cd9.tar.gz
arm: dsputil: Drop restrict keyword from add_pixels_clamped_armv6 prototype
The function is assigned to a function pointer that does not have the restrict keyword for that parameter. This fixes compilation for MSVC builds that don't recognize "restrict", broken since ed9625eb62.
-rw-r--r--libavcodec/arm/dsputil_init_armv6.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/arm/dsputil_init_armv6.c b/libavcodec/arm/dsputil_init_armv6.c
index 357ae1e..09a30cf 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);
OpenPOWER on IntegriCloud