From: Clément Bœsch <cboesch@gopro.com>
Date: Thu, 30 Mar 2017 08:14:21 +0000 (+0200)
Subject: Merge commit 'c778eb15b89d875cb246b18f65b3b4321cb1e7d6'
X-Git-Tag: n3.4-dev~160
X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/7b89015715046e2a35f584caab2f11625809754c

Merge commit 'c778eb15b89d875cb246b18f65b3b4321cb1e7d6'

* commit 'c778eb15b89d875cb246b18f65b3b4321cb1e7d6':
  pixblockdsp: Have function pointer prototype match implementation

Merged-by: Clément Bœsch <cboesch@gopro.com>
---

7b89015715046e2a35f584caab2f11625809754c
diff --cc libavcodec/pixblockdsp.h
index 278accb,c7587cb..3ba1596
--- a/libavcodec/pixblockdsp.h
+++ b/libavcodec/pixblockdsp.h
@@@ -24,10 -26,10 +26,10 @@@
  #include "avcodec.h"
  
  typedef struct PixblockDSPContext {
-     void (*get_pixels)(int16_t *block /* align 16 */,
 -    void (*get_pixels)(int16_t *restrict block /* align 16 */,
++    void (*get_pixels)(int16_t *av_restrict block /* align 16 */,
                         const uint8_t *pixels /* align 8 */,
                         ptrdiff_t stride);
-     void (*diff_pixels)(int16_t *block /* align 16 */,
 -    void (*diff_pixels)(int16_t *restrict block /* align 16 */,
++    void (*diff_pixels)(int16_t *av_restrict block /* align 16 */,
                          const uint8_t *s1 /* align 8 */,
                          const uint8_t *s2 /* align 8 */,
                          ptrdiff_t stride);