ffmpeg | branch: master | Clément Bœsch <cboe...@gopro.com> | Thu Mar 30 10:21:37 2017 +0200| [77248d12181288dd00d1f83fc03649ef14e4dfbe] | committer: Clément Bœsch
Merge commit '6354957a95022864746180525680cca872ab0e0a' * commit '6354957a95022864746180525680cca872ab0e0a': dnxhdenc: Have function pointer prototype match implementation Merged-by: Clément Bœsch <cboe...@gopro.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=77248d12181288dd00d1f83fc03649ef14e4dfbe --- libavcodec/dnxhdenc.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavcodec/dnxhdenc.h b/libavcodec/dnxhdenc.h index eb9da12..bcb25cd 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); ====================================================================== diff --cc libavcodec/dnxhdenc.h index eb9da12,c6755f7..bcb25cd --- a/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); _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog