Merge commit '4cf2ffb7c45840b09bc49e34da88d4053dd442cb'

* commit '4cf2ffb7c45840b09bc49e34da88d4053dd442cb':
  idct: Have function pointer prototype match implementation

Merged-by: Clément Bœsch <u@pkh.me>
This commit is contained in:
Clément Bœsch 2017-03-29 14:37:35 +02:00
commit c1d822c554

View File

@ -21,6 +21,8 @@
#include <stdint.h> #include <stdint.h>
#include "config.h"
#include "avcodec.h" #include "avcodec.h"
/** /**
@ -51,13 +53,13 @@ int ff_init_scantable_permutation_x86(uint8_t *idct_permutation,
typedef struct IDCTDSPContext { typedef struct IDCTDSPContext {
/* pixel ops : interface with DCT */ /* pixel ops : interface with DCT */
void (*put_pixels_clamped)(const int16_t *block /* align 16 */, 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); ptrdiff_t line_size);
void (*put_signed_pixels_clamped)(const int16_t *block /* align 16 */, 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); ptrdiff_t line_size);
void (*add_pixels_clamped)(const int16_t *block /* align 16 */, 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); ptrdiff_t line_size);
void (*idct)(int16_t *block /* align 16 */); void (*idct)(int16_t *block /* align 16 */);