Merge commit 'c778eb15b89d875cb246b18f65b3b4321cb1e7d6'
authorClément Bœsch <cboesch@gopro.com>
Thu, 30 Mar 2017 08:14:21 +0000 (10:14 +0200)
committerClément Bœsch <cboesch@gopro.com>
Thu, 30 Mar 2017 08:14:21 +0000 (10:14 +0200)
* commit 'c778eb15b89d875cb246b18f65b3b4321cb1e7d6':
  pixblockdsp: Have function pointer prototype match implementation

Merged-by: Clément Bœsch <cboesch@gopro.com>
1  2 
libavcodec/pixblockdsp.h

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