Merge commit '6354957a95022864746180525680cca872ab0e0a'

* commit '6354957a95022864746180525680cca872ab0e0a':
  dnxhdenc: Have function pointer prototype match implementation

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

diff --cc libavcodec/dnxhdenc.h
index eb9da12,c6755f7..bcb25cd
--- 1/libavcodec/dnxhdenc.h
--- 2/libavcodec/dnxhdenc.h
+++ b/libavcodec/dnxhdenc.h
@@@ -96,11 -93,10 +98,11 @@@ typedef struct DNXHDEncContext 
      uint8_t  *mb_qscale;
  
      RCCMPEntry *mb_cmp;
 -    RCEntry   (*mb_rc)[8160];
 +    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 *restrict /* align 16 */ block,
++    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);