diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-28 01:07:36 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-28 01:16:06 +0400 |
| commit | e2abc0d5cacc22aa900de8ac26160ea1b786a7b5 (patch) | |
| tree | 536e4539c573752b2b446d2c8ef17d9d62927815 /libavcodec/dsputil.h | |
| parent | 43c57dbe14545d13dbfd8aae341b45514e8bcfbb (diff) | |
| parent | 0d439fbede03854eac8a978cccf21a3425a3c82d (diff) | |
Merge commit '0d439fbede03854eac8a978cccf21a3425a3c82d'
* commit '0d439fbede03854eac8a978cccf21a3425a3c82d':
dsputil: Split off HuffYUV decoding bits into their own context
Conflicts:
configure
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/huffyuv.h
libavcodec/huffyuvdec.c
libavcodec/lagarith.c
libavcodec/vble.c
libavcodec/x86/Makefile
libavcodec/x86/dsputil.asm
libavcodec/x86/dsputil_init.c
libavcodec/x86/dsputil_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, 1 insertions, 12 deletions
diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index f8eb8fd008..af2ef98b37 100644 --- a/libavcodec/dsputil.h +++ b/libavcodec/dsputil.h @@ -188,9 +188,6 @@ typedef struct DSPContext { me_cmp_func pix_abs[2][4]; /* HuffYUV specific */ - void (*add_bytes)(uint8_t *dst /* align 16 */, - uint8_t *src /* align 16 */, - int w); void (*diff_bytes)(uint8_t *dst /* align 16 */, const uint8_t *src1 /* align 16 */, const uint8_t *src2 /* align 1 */, @@ -202,15 +199,7 @@ typedef struct DSPContext { void (*sub_hfyu_median_prediction)(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, int w, int *left, int *left_top); - void (*add_hfyu_median_prediction)(uint8_t *dst, const uint8_t *top, - const uint8_t *diff, int w, - int *left, int *left_top); - int (*add_hfyu_left_prediction)(uint8_t *dst, const uint8_t *src, - int w, int left); - void (*add_hfyu_left_prediction_bgr32)(uint8_t *dst, const uint8_t *src, - int w, int *red, int *green, - int *blue, int *alpha); - /* this might write to dst[w] */ + void (*bswap_buf)(uint32_t *dst, const uint32_t *src, int w); void (*bswap16_buf)(uint16_t *dst, const uint16_t *src, int len); |