Merge commit '12b54a1f39fee22fa0399825ae47a43e60bad4c5'

[ffmpeg] / libavcodec / dnxhdenc.h

diff --git a/libavcodec/dnxhdenc.h b/libavcodec/dnxhdenc.h
index 36a42fb1001a0e16948f3abd86eafe4bb08f7eb7..9b59b96d3e41ca67c20c22b4de87a0d082717da0 100644 (file)
--- a/libavcodec/dnxhdenc.h
+++ b/libavcodec/dnxhdenc.h
@@ -64,7 +64,7 @@ typedef struct DNXHDEncContext {
     int nitris_compat;
     unsigned min_padding;
 
-    DECLARE_ALIGNED(16, DCTELEM, blocks)[8][64];
+    DECLARE_ALIGNED(16, int16_t, blocks)[8][64];
 
     int      (*qmatrix_c)     [64];
     int      (*qmatrix_l)     [64];
@@ -90,7 +90,7 @@ typedef struct DNXHDEncContext {
     RCCMPEntry *mb_cmp;
     RCEntry   (*mb_rc)[8160];
 
-    void (*get_pixels_8x4_sym)(DCTELEM * /*align 16*/, const uint8_t *, int);
+    void (*get_pixels_8x4_sym)(int16_t * /*align 16*/, const uint8_t *, int);
 } DNXHDEncContext;
 
 void ff_dnxhdenc_init_x86(DNXHDEncContext *ctx);