ffmpeg | branch: master | Clément Bœsch <u...@pkh.me> | Wed Mar 29 14:37:35 2017 +0200| [c1d822c554ac448b3a6d037ad507578f0793c847] | committer: Clément Bœsch
Merge commit '4cf2ffb7c45840b09bc49e34da88d4053dd442cb' * commit '4cf2ffb7c45840b09bc49e34da88d4053dd442cb': idct: Have function pointer prototype match implementation Merged-by: Clément Bœsch <u...@pkh.me> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c1d822c554ac448b3a6d037ad507578f0793c847 --- libavcodec/idctdsp.h | 8 +++++--- 1 file 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 */); ====================================================================== _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
