[FFmpeg-cvslog] Merge commit 'baab87c4f30e75ea309294b06adcd01ce678bdc5'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Wed Mar 29 15:09:19 2017 +0200| [a51867ee6bc717a54ea2436e31ee626f02fdf25d] | committer: Clément Bœsch

Merge commit 'baab87c4f30e75ea309294b06adcd01ce678bdc5'

* commit 'baab87c4f30e75ea309294b06adcd01ce678bdc5':
  bink: Have function pointer prototype match implementation

Merged-by: Clément Bœsch <u at pkh.me>

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

 libavcodec/binkdsp.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libavcodec/binkdsp.h b/libavcodec/binkdsp.h
index f319d1f..b089a98 100644
--- a/libavcodec/binkdsp.h
+++ b/libavcodec/binkdsp.h
@@ -29,11 +29,13 @@
 
 #include <stdint.h>
 
+#include "config.h"
+
 typedef struct BinkDSPContext {
     void (*idct_put)(uint8_t *dest/*align 8*/, int line_size, int32_t *block/*align 16*/);
     void (*idct_add)(uint8_t *dest/*align 8*/, int line_size, int32_t *block/*align 16*/);
     void (*scale_block)(const uint8_t src[64]/*align 8*/, uint8_t *dst/*align 8*/, int linesize);
-    void (*add_pixels8)(uint8_t *pixels, int16_t *block, int line_size);
+    void (*add_pixels8)(uint8_t *av_restrict pixels, int16_t *block, int line_size);
 } BinkDSPContext;
 
 void ff_binkdsp_init(BinkDSPContext *c);


======================================================================

diff --cc libavcodec/binkdsp.h
index f319d1f,9524fe2..b089a98
--- a/libavcodec/binkdsp.h
+++ b/libavcodec/binkdsp.h
@@@ -33,7 -35,7 +35,7 @@@ typedef struct BinkDSPContext 
      void (*idct_put)(uint8_t *dest/*align 8*/, int line_size, int32_t *block/*align 16*/);
      void (*idct_add)(uint8_t *dest/*align 8*/, int line_size, int32_t *block/*align 16*/);
      void (*scale_block)(const uint8_t src[64]/*align 8*/, uint8_t *dst/*align 8*/, int linesize);
-     void (*add_pixels8)(uint8_t *pixels, int16_t *block, int line_size);
 -    void (*add_pixels8)(uint8_t *restrict pixels, int16_t *block, int line_size);
++    void (*add_pixels8)(uint8_t *av_restrict pixels, int16_t *block, int line_size);
  } BinkDSPContext;
  
  void ff_binkdsp_init(BinkDSPContext *c);