RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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:
Clément Bœsch 2017-03-30 10:14:21 +02:00
parent c223784ea7 c778eb15b8
commit 7b89015715
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/pixblockdsp.h
View File

@ -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);