diff options
| author | Clément Bœsch <u@pkh.me> | 2017-03-29 15:09:19 +0200 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2017-03-29 15:09:26 +0200 |
| commit | a51867ee6bc717a54ea2436e31ee626f02fdf25d (patch) | |
| tree | 836d43cc18fa7dad39e2f9e544fb0a1a53e4dcfa /libavcodec/binkdsp.h | |
| parent | d467740f45eb20e217de6bc6b9c91d57d6f8a88e (diff) | |
| parent | baab87c4f30e75ea309294b06adcd01ce678bdc5 (diff) | |
Merge commit 'baab87c4f30e75ea309294b06adcd01ce678bdc5'
* commit 'baab87c4f30e75ea309294b06adcd01ce678bdc5':
bink: Have function pointer prototype match implementation
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavcodec/binkdsp.h')
| -rw-r--r-- | libavcodec/binkdsp.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/binkdsp.h b/libavcodec/binkdsp.h index f319d1ffe5..b089a9863f 100644 --- a/libavcodec/binkdsp.h +++ b/libavcodec/binkdsp.h @@ -29,11 +29,13 @@ #include <stdint.h> +#include "config.h" + typedef struct BinkDSPContext { void (*idct_put)(uint8_t *dest/*align 8*/, int line_size, int32_t *block/*align 16*/); void (*idct_add)(uint8_t *dest/*align 8*/, int line_size, int32_t *block/*align 16*/); void (*scale_block)(const uint8_t src[64]/*align 8*/, uint8_t *dst/*align 8*/, int linesize); - void (*add_pixels8)(uint8_t *pixels, int16_t *block, int line_size); + void (*add_pixels8)(uint8_t *av_restrict pixels, int16_t *block, int line_size); } BinkDSPContext; void ff_binkdsp_init(BinkDSPContext *c); |