diff options
| author | Clément Bœsch <cboesch@gopro.com> | 2017-03-30 10:14:21 +0200 |
|---|---|---|
| committer | Clément Bœsch <cboesch@gopro.com> | 2017-03-30 10:14:21 +0200 |
| commit | 7b89015715046e2a35f584caab2f11625809754c (patch) | |
| tree | 634ebbab363dcf1d8146fdac28e11743d04c1029 /libavcodec/pixblockdsp.h | |
| parent | c223784ea7f320032b8c407815441f98b7241421 (diff) | |
| parent | c778eb15b89d875cb246b18f65b3b4321cb1e7d6 (diff) | |
| download | ffmpeg-7b89015715046e2a35f584caab2f11625809754c.tar.gz | |
Merge commit 'c778eb15b89d875cb246b18f65b3b4321cb1e7d6'
* commit 'c778eb15b89d875cb246b18f65b3b4321cb1e7d6':
pixblockdsp: Have function pointer prototype match implementation
Merged-by: Clément Bœsch <cboesch@gopro.com>
Diffstat (limited to 'libavcodec/pixblockdsp.h')
| -rw-r--r-- | libavcodec/pixblockdsp.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/pixblockdsp.h b/libavcodec/pixblockdsp.h index 278accb1d4..3ba1596a88 100644 --- a/libavcodec/pixblockdsp.h +++ b/libavcodec/pixblockdsp.h @@ -21,13 +21,15 @@ #include <stdint.h> +#include "config.h" + #include "avcodec.h" typedef struct PixblockDSPContext { - void (*get_pixels)(int16_t *block /* align 16 */, + void (*get_pixels)(int16_t *av_restrict block /* align 16 */, const uint8_t *pixels /* align 8 */, ptrdiff_t stride); - void (*diff_pixels)(int16_t *block /* align 16 */, + void (*diff_pixels)(int16_t *av_restrict block /* align 16 */, const uint8_t *s1 /* align 8 */, const uint8_t *s2 /* align 8 */, ptrdiff_t stride); |