Merge commit 'baab87c4'

* commit 'baab87c4':
  bink: Have function pointer prototype match implementation
Merged-by: Clément Bœsch <u@pkh.me>

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);