[FFmpeg-cvslog] arm: dsputil: Drop restrict keyword from add_pixels_clamped_armv6 prototype

Diego Biurrun git at videolan.org
Fri Mar 14 18:34:40 CET 2014


ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Fri Mar 14 13:22:50 2014 +0100| [36b822b8be7f9ecd6f9d87acaa786b128a873cd9] | committer: Diego Biurrun

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.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=36b822b8be7f9ecd6f9d87acaa786b128a873cd9
---

 libavcodec/arm/dsputil_init_armv6.c |    3 +--
 1 file changed, 1 insertion(+), 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);



More information about the ffmpeg-cvslog mailing list