diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-30 01:23:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-30 01:23:04 +0200 |
| commit | d35899ccce39e77a3f7fb667bdfc710c605d03a4 (patch) | |
| tree | a72ecac476a799f37c63fe704758f61044a999e8 /libavcodec/binkdsp.h | |
| parent | 40f3a87c10d5773eb66e09f4ed3d8197b1840863 (diff) | |
| parent | cb52a17cb62297802b0a77e5af9850d87c3f925b (diff) | |
Merge commit 'cb52a17cb62297802b0a77e5af9850d87c3f925b'
* commit 'cb52a17cb62297802b0a77e5af9850d87c3f925b':
dsputil: Move Bink-specific add_pixels8 to binkdsp
Conflicts:
libavcodec/dsputil.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/binkdsp.h')
| -rw-r--r-- | libavcodec/binkdsp.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/binkdsp.h b/libavcodec/binkdsp.h index 6b84e014ab..f319d1ffe5 100644 --- a/libavcodec/binkdsp.h +++ b/libavcodec/binkdsp.h @@ -33,6 +33,7 @@ typedef struct BinkDSPContext { void (*idct_put)(uint8_t *dest/*align 8*/, int line_size, int32_t *block/*align 16*/); void (*idct_add)(uint8_t *dest/*align 8*/, int line_size, int32_t *block/*align 16*/); void (*scale_block)(const uint8_t src[64]/*align 8*/, uint8_t *dst/*align 8*/, int linesize); + void (*add_pixels8)(uint8_t *pixels, int16_t *block, int line_size); } BinkDSPContext; void ff_binkdsp_init(BinkDSPContext *c); |