diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-28 00:03:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-28 00:03:59 +0200 |
| commit | 48a691630833d6b12905475b6bf39fef285872a9 (patch) | |
| tree | aaeb0c4d73c6c0c72606aae3c4a1de62b17dc6e7 /libavcodec/dsputil.h | |
| parent | e2abc0d5cacc22aa900de8ac26160ea1b786a7b5 (diff) | |
| parent | 512f3ffe9b4bb86767c2b1176554407c75fe1a5c (diff) | |
| download | ffmpeg-48a691630833d6b12905475b6bf39fef285872a9.tar.gz | |
Merge commit '512f3ffe9b4bb86767c2b1176554407c75fe1a5c'
* commit '512f3ffe9b4bb86767c2b1176554407c75fe1a5c':
dsputil: Split off HuffYUV encoding bits into their own context
Conflicts:
configure
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/huffyuv.h
libavcodec/huffyuvenc.c
libavcodec/pngenc.c
libavcodec/x86/dsputilenc_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dsputil.h')
| -rw-r--r-- | libavcodec/dsputil.h | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index af2ef98b37..df685a594d 100644 --- a/libavcodec/dsputil.h +++ b/libavcodec/dsputil.h @@ -187,19 +187,6 @@ typedef struct DSPContext { me_cmp_func pix_abs[2][4]; - /* HuffYUV specific */ - void (*diff_bytes)(uint8_t *dst /* align 16 */, - const uint8_t *src1 /* align 16 */, - const uint8_t *src2 /* align 1 */, - int w); - /** - * Subtract HuffYUV's variant of median prediction. - * Note, this might read from src1[-1], src2[-1]. - */ - void (*sub_hfyu_median_prediction)(uint8_t *dst, const uint8_t *src1, - const uint8_t *src2, int w, - int *left, int *left_top); - void (*bswap_buf)(uint32_t *dst, const uint32_t *src, int w); void (*bswap16_buf)(uint16_t *dst, const uint16_t *src, int len); |