[FFmpeg-cvslog] Merge commit 'c778eb15b89d875cb246b18f65b3b4321cb1e7d6'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <cboesch at gopro.com> | Thu Mar 30 10:14:21 2017 +0200| [7b89015715046e2a35f584caab2f11625809754c] | committer: Clément Bœsch

Merge commit 'c778eb15b89d875cb246b18f65b3b4321cb1e7d6'

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

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

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

 libavcodec/pixblockdsp.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/libavcodec/pixblockdsp.h b/libavcodec/pixblockdsp.h
index 278accb..3ba1596 100644
--- a/libavcodec/pixblockdsp.h
+++ b/libavcodec/pixblockdsp.h
@@ -21,13 +21,15 @@
 
 #include <stdint.h>
 
+#include "config.h"
+
 #include "avcodec.h"
 
 typedef struct PixblockDSPContext {
-    void (*get_pixels)(int16_t *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 *av_restrict block /* align 16 */,
                         const uint8_t *s1 /* align 8 */,
                         const uint8_t *s2 /* align 8 */,
                         ptrdiff_t stride);


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

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