Merge commit '00aeedd84105a17f414185bd33ecadebeddb3a27'

[ffmpeg] / libavcodec / dnxhdenc.h

diff --git a/libavcodec/dnxhdenc.h b/libavcodec/dnxhdenc.h
index eb9da12deefcae44464f1781a2d43e85d3867a7d..bcb25cd83282fb1924e7279b85a92849fd6c28f1 100644 (file)
--- a/libavcodec/dnxhdenc.h
+++ b/libavcodec/dnxhdenc.h
@@ -26,6 +26,8 @@
 
 #include <stdint.h>
 
+#include "config.h"
+
 #include "mpegvideo.h"
 #include "dnxhddata.h"
 
@@ -99,8 +101,8 @@ typedef struct DNXHDEncContext {
     RCCMPEntry *mb_cmp_tmp;
     RCEntry    *mb_rc;
 
-    void (*get_pixels_8x4_sym)(int16_t * /* align 16 */,
-                               const uint8_t *, ptrdiff_t);
+    void (*get_pixels_8x4_sym)(int16_t *av_restrict /* align 16 */ block,
+                               const uint8_t *pixels, ptrdiff_t line_size);
 } DNXHDEncContext;
 
 void ff_dnxhdenc_init_x86(DNXHDEncContext *ctx);