diff options
| -rw-r--r-- | libavcodec/hpeldsp.h | 11 | ||||
| -rw-r--r-- | libavcodec/vc1dsp.h | 1 |
2 files changed, 5 insertions, 7 deletions
diff --git a/libavcodec/hpeldsp.h b/libavcodec/hpeldsp.h index 8e68729d8a..bf868a5c34 100644 --- a/libavcodec/hpeldsp.h +++ b/libavcodec/hpeldsp.h @@ -35,9 +35,6 @@ // 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); @@ -56,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. @@ -68,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. @@ -80,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[4][4]; + op_pixels_func put_no_rnd_pixels_tab[4][4]; /** * Halfpel motion compensation with no rounding (a+b)>>1. @@ -92,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); diff --git a/libavcodec/vc1dsp.h b/libavcodec/vc1dsp.h index 851e40c735..5e332a0e4f 100644 --- a/libavcodec/vc1dsp.h +++ b/libavcodec/vc1dsp.h @@ -29,6 +29,7 @@ #define AVCODEC_VC1DSP_H #include "dsputil.h" +#include "hpeldsp.h" #include "h264chroma.h" typedef void (*vc1op_pixels_func)(uint8_t *block/*align width (8 or 16)*/, const uint8_t *pixels/*align 1*/, ptrdiff_t line_size, int h); |