diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2013-03-10 14:23:46 -0700 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2013-04-19 23:29:22 +0300 |
| commit | 54cd5e4f92de6bd0fb8e24069153b0156c8136bc (patch) | |
| tree | f71fd73f568f8f67e0f0129ac59f8fdebd1c3ff7 /libavcodec/hpeldsp.h | |
| parent | 2957d29f0531ccd8a6f4378293424dfd92db3044 (diff) | |
| download | ffmpeg-54cd5e4f92de6bd0fb8e24069153b0156c8136bc.tar.gz | |
dsputil: Remove hpel functions (moved to hpeldsp)
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavcodec/hpeldsp.h')
| -rw-r--r-- | libavcodec/hpeldsp.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/hpeldsp.h b/libavcodec/hpeldsp.h index 68190ad8c3..aa58184ed1 100644 --- a/libavcodec/hpeldsp.h +++ b/libavcodec/hpeldsp.h @@ -35,9 +35,9 @@ // blocksizes for hpel_pixels_func are 8x4,8x8 16x8 16x16 // h for hpel_pixels_func is limited to {width/2, width} but never larger // than 16 and never smaller than 4 -typedef void (*hpel_pixels_func)(uint8_t *block /*align width (8 or 16)*/, - const uint8_t *pixels /*align 1*/, - ptrdiff_t line_size, int h); +typedef void (*op_pixels_func)(uint8_t *block /*align width (8 or 16)*/, + const uint8_t *pixels /*align 1*/, + ptrdiff_t line_size, int h); /** * Half-pel DSP context. @@ -53,7 +53,7 @@ typedef struct HpelDSPContext { * @param line_size number of bytes in a horizontal line of block * @param h height */ - hpel_pixels_func put_pixels_tab[4][4]; + op_pixels_func put_pixels_tab[4][4]; /** * Halfpel motion compensation with rounding (a+b+1)>>1. @@ -65,7 +65,7 @@ typedef struct HpelDSPContext { * @param line_size number of bytes in a horizontal line of block * @param h height */ - hpel_pixels_func avg_pixels_tab[4][4]; + op_pixels_func avg_pixels_tab[4][4]; /** * Halfpel motion compensation with no rounding (a+b)>>1. @@ -77,7 +77,7 @@ typedef struct HpelDSPContext { * @param line_size number of bytes in a horizontal line of block * @param h height */ - hpel_pixels_func put_no_rnd_pixels_tab[2][4]; + op_pixels_func put_no_rnd_pixels_tab[2][4]; /** * Halfpel motion compensation with no rounding (a+b)>>1. @@ -89,7 +89,7 @@ typedef struct HpelDSPContext { * @param line_size number of bytes in a horizontal line of block * @param h height */ - hpel_pixels_func avg_no_rnd_pixels_tab[4]; + op_pixels_func avg_no_rnd_pixels_tab[4]; } HpelDSPContext; void ff_hpeldsp_init(HpelDSPContext *c, int flags); |