summaryrefslogtreecommitdiff
path: root/libavcodec/hpeldsp.h
diff options
context:
space:
mode:
authorRonald S. Bultje <rsbultje@gmail.com>2013-03-10 14:23:46 -0700
committerMichael Niedermayer <michaelni@gmx.at>2013-03-13 04:11:41 +0100
commitf536df99feb7a86f9940c62bd42be0826146ebe5 (patch)
tree7d5ffaa4ca45bc9499eabc56faca1f8dda9fba6f /libavcodec/hpeldsp.h
parent94b77678dcdf26cd91b20e8182f07af5f237ad27 (diff)
dsputil: remove hpel functions (moved to hpeldsp).
Diffstat (limited to 'libavcodec/hpeldsp.h')
-rw-r--r--libavcodec/hpeldsp.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/hpeldsp.h b/libavcodec/hpeldsp.h
index 8e4ae8ceb4..a71a82e8ad 100644
--- a/libavcodec/hpeldsp.h
+++ b/libavcodec/hpeldsp.h
@@ -35,9 +35,9 @@
// blocksizes for op_pixels_func are 8x4,8x8 16x8 16x16
// h for op_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* p, int flags);