diff options
author | Clément Bœsch <u@pkh.me> | 2017-03-29 14:37:35 +0200 |
---|---|---|
committer | Clément Bœsch <u@pkh.me> | 2017-03-29 14:37:35 +0200 |
commit | c1d822c554ac448b3a6d037ad507578f0793c847 (patch) | |
tree | 4bba224ffae327e4562d399b314c6b30e9521245 /libavcodec | |
parent | 35494441b5327d71e7a81896efd610408651c657 (diff) | |
parent | 4cf2ffb7c45840b09bc49e34da88d4053dd442cb (diff) | |
download | ffmpeg-streaming-c1d822c554ac448b3a6d037ad507578f0793c847.zip ffmpeg-streaming-c1d822c554ac448b3a6d037ad507578f0793c847.tar.gz |
Merge commit '4cf2ffb7c45840b09bc49e34da88d4053dd442cb'
* commit '4cf2ffb7c45840b09bc49e34da88d4053dd442cb':
idct: Have function pointer prototype match implementation
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/idctdsp.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libavcodec/idctdsp.h b/libavcodec/idctdsp.h index abfa587..0b80aef 100644 --- a/libavcodec/idctdsp.h +++ b/libavcodec/idctdsp.h @@ -21,6 +21,8 @@ #include <stdint.h> +#include "config.h" + #include "avcodec.h" /** @@ -51,13 +53,13 @@ int ff_init_scantable_permutation_x86(uint8_t *idct_permutation, typedef struct IDCTDSPContext { /* pixel ops : interface with DCT */ void (*put_pixels_clamped)(const int16_t *block /* align 16 */, - uint8_t *pixels /* align 8 */, + uint8_t *restrict pixels /* align 8 */, ptrdiff_t line_size); void (*put_signed_pixels_clamped)(const int16_t *block /* align 16 */, - uint8_t *pixels /* align 8 */, + uint8_t *restrict pixels /* align 8 */, ptrdiff_t line_size); void (*add_pixels_clamped)(const int16_t *block /* align 16 */, - uint8_t *pixels /* align 8 */, + uint8_t *restrict pixels /* align 8 */, ptrdiff_t line_size); void (*idct)(int16_t *block /* align 16 */); |