diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2002-09-11 12:39:53 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2002-09-11 12:39:53 +0000 |
| commit | b3184779924e40e82b1f92b4b315b2c4074a9669 (patch) | |
| tree | 6f76a3ff7ce70d6d424f60206de7496f3845873f /libavcodec/dsputil.h | |
| parent | 6b460aa387530feefc91302c150a3405997e61cf (diff) | |
| download | ffmpeg-b3184779924e40e82b1f92b4b315b2c4074a9669.tar.gz | |
put/avg_pixels16
fixing 2 small qpel bugs
Originally committed as revision 915 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/dsputil.h')
| -rw-r--r-- | libavcodec/dsputil.h | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index 8703203269..0ec9d5cccb 100644 --- a/libavcodec/dsputil.h +++ b/libavcodec/dsputil.h @@ -74,14 +74,22 @@ void clear_blocks_c(DCTELEM *blocks); /* add and put pixel (decoding) */ typedef void (*op_pixels_func)(UINT8 *block, const UINT8 *pixels, int line_size, int h); -typedef void (*qpel_mc_func)(UINT8 *dst, UINT8 *src, int dstStride, int srcStride, int mx, int my); - -extern op_pixels_func put_pixels_tab[4]; -extern op_pixels_func avg_pixels_tab[4]; -extern op_pixels_func put_no_rnd_pixels_tab[4]; -extern op_pixels_func avg_no_rnd_pixels_tab[4]; -extern qpel_mc_func qpel_mc_rnd_tab[16]; -extern qpel_mc_func qpel_mc_no_rnd_tab[16]; +typedef void (*qpel_mc_func)(UINT8 *dst, UINT8 *src, int stride); + +extern op_pixels_func put_pixels_tab[2][4]; +extern op_pixels_func avg_pixels_tab[2][4]; +extern op_pixels_func put_no_rnd_pixels_tab[2][4]; +extern op_pixels_func avg_no_rnd_pixels_tab[2][4]; +extern qpel_mc_func put_qpel_pixels_tab[2][16]; +extern qpel_mc_func avg_qpel_pixels_tab[2][16]; +extern qpel_mc_func put_no_rnd_qpel_pixels_tab[2][16]; +extern qpel_mc_func avg_no_rnd_qpel_pixels_tab[2][16]; + +#define CALL_2X_PIXELS(a, b, n)\ +static void a(uint8_t *block, const uint8_t *pixels, int line_size, int h){\ + b(block , pixels , line_size, h);\ + b(block+n, pixels+n, line_size, h);\ +} /* motion estimation */ |