diff options
author | Clément Bœsch <cboesch@gopro.com> | 2017-03-30 10:21:37 +0200 |
---|---|---|
committer | Clément Bœsch <cboesch@gopro.com> | 2017-03-30 10:21:41 +0200 |
commit | 77248d12181288dd00d1f83fc03649ef14e4dfbe (patch) | |
tree | cb04bd958f74bac31c559bfa8768ad226151fca4 /libavcodec/dnxhdenc.h | |
parent | 7b89015715046e2a35f584caab2f11625809754c (diff) | |
parent | 6354957a95022864746180525680cca872ab0e0a (diff) |
Merge commit '6354957a95022864746180525680cca872ab0e0a'
* commit '6354957a95022864746180525680cca872ab0e0a':
dnxhdenc: Have function pointer prototype match implementation
Merged-by: Clément Bœsch <cboesch@gopro.com>
Diffstat (limited to 'libavcodec/dnxhdenc.h')
-rw-r--r-- | libavcodec/dnxhdenc.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/dnxhdenc.h b/libavcodec/dnxhdenc.h index eb9da12dee..bcb25cd832 100644 --- 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); |