diff options
Diffstat (limited to 'libavcodec/dsputil.h')
| -rw-r--r-- | libavcodec/dsputil.h | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index 44d2f08e39..ca7fee574a 100644 --- a/libavcodec/dsputil.h +++ b/libavcodec/dsputil.h @@ -196,15 +196,12 @@ void ff_init_scantable_permutation(uint8_t *idct_permutation, int idct_permutation_type); #define EMULATED_EDGE(depth) \ -void ff_emulated_edge_mc_ ## depth (uint8_t *buf, const uint8_t *src, int linesize,\ +void ff_emulated_edge_mc_ ## depth (uint8_t *buf, const uint8_t *src, ptrdiff_t linesize,\ int block_w, int block_h,\ int src_x, int src_y, int w, int h); EMULATED_EDGE(8) -EMULATED_EDGE(9) -EMULATED_EDGE(10) -EMULATED_EDGE(12) -EMULATED_EDGE(14) +EMULATED_EDGE(16) /** * DSPContext. @@ -225,21 +222,6 @@ typedef struct DSPContext { void (*add_pixels4)(uint8_t *pixels, DCTELEM *block, int line_size); int (*sum_abs_dctelem)(DCTELEM *block/*align 16*/); /** - * Motion estimation with emulated edge values. - * @param buf pointer to destination buffer (unaligned) - * @param src pointer to pixel source (unaligned) - * @param linesize width (in pixels) for src/buf - * @param block_w number of pixels (per row) to copy to buf - * @param block_h nummber of pixel rows to copy to buf - * @param src_x offset of src to start of row - this may be negative - * @param src_y offset of src to top of image - this may be negative - * @param w width of src in pixels - * @param h height of src in pixels - */ - void (*emulated_edge_mc)(uint8_t *buf, const uint8_t *src, int linesize, - int block_w, int block_h, - int src_x, int src_y, int w, int h); - /** * translational global motion compensation. */ void (*gmc1)(uint8_t *dst/*align 8*/, uint8_t *src/*align 1*/, int srcStride, int h, int x16, int y16, int rounder); @@ -475,8 +457,6 @@ typedef struct DSPContext { #define EDGE_TOP 1 #define EDGE_BOTTOM 2 - void (*prefetch)(void *mem, int stride, int h); - void (*shrink[4])(uint8_t *dst, int dst_wrap, const uint8_t *src, int src_wrap, int width, int height); /** |