mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit 'c778eb15b89d875cb246b18f65b3b4321cb1e7d6'
* commit 'c778eb15b89d875cb246b18f65b3b4321cb1e7d6': pixblockdsp: Have function pointer prototype match implementation Merged-by: Clément Bœsch <cboesch@gopro.com>
This commit is contained in:
commit
7b89015715
|
@ -21,13 +21,15 @@
|
||||||
|
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
|
|
||||||
|
#include "config.h"
|
||||||
|
|
||||||
#include "avcodec.h"
|
#include "avcodec.h"
|
||||||
|
|
||||||
typedef struct PixblockDSPContext {
|
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 */,
|
const uint8_t *pixels /* align 8 */,
|
||||||
ptrdiff_t stride);
|
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 *s1 /* align 8 */,
|
||||||
const uint8_t *s2 /* align 8 */,
|
const uint8_t *s2 /* align 8 */,
|
||||||
ptrdiff_t stride);
|
ptrdiff_t stride);
|
||||||
|
|
Loading…
Reference in New Issue