Merge commit '124e26971e69bb25f38c6c7cb3fa20c77cf10966'

[ffmpeg] / libavcodec / pixblockdsp.h

diff --git a/libavcodec/pixblockdsp.h b/libavcodec/pixblockdsp.h
index 278accb1d493a4864f43c12b9a2fff1f340bcf58..3ba1596a8856bb948efd29af413be8f9cd755d8c 100644 (file)
--- 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);