diff options
author | Roman Shaposhnik <roman@shaposhnik.org> | 2009-02-19 00:28:08 +0000 |
---|---|---|
committer | Roman Shaposhnik <roman@shaposhnik.org> | 2009-02-19 00:28:08 +0000 |
commit | 3899eb2f65ddcda27e352edb760e181cb11cbc76 (patch) | |
tree | 9e8857bf3f392b9da90c3e7f7c6999a0bc3b9490 /libavcodec/dsputil.h | |
parent | d52b39c79c015793c7ed3cde84fc9c98fbf527b9 (diff) | |
download | ffmpeg-3899eb2f65ddcda27e352edb760e181cb11cbc76.tar.gz |
Making the arrays accomodate an extra intra 8x8 cmp function
Originally committed as revision 17446 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/dsputil.h')
-rw-r--r-- | libavcodec/dsputil.h | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index 7240cde7ee..e9c2bfc77e 100644 --- a/libavcodec/dsputil.h +++ b/libavcodec/dsputil.h @@ -218,27 +218,27 @@ typedef struct DSPContext { int (*pix_norm1)(uint8_t * pix, int line_size); // 16x16 8x8 4x4 2x2 16x8 8x4 4x2 8x16 4x8 2x4 - me_cmp_func sad[5]; /* identical to pix_absAxA except additional void * */ - me_cmp_func sse[5]; - me_cmp_func hadamard8_diff[5]; - me_cmp_func dct_sad[5]; - me_cmp_func quant_psnr[5]; - me_cmp_func bit[5]; - me_cmp_func rd[5]; - me_cmp_func vsad[5]; - me_cmp_func vsse[5]; - me_cmp_func nsse[5]; - me_cmp_func w53[5]; - me_cmp_func w97[5]; - me_cmp_func dct_max[5]; - me_cmp_func dct264_sad[5]; - - me_cmp_func me_pre_cmp[5]; - me_cmp_func me_cmp[5]; - me_cmp_func me_sub_cmp[5]; - me_cmp_func mb_cmp[5]; - me_cmp_func ildct_cmp[5]; //only width 16 used - me_cmp_func frame_skip_cmp[5]; //only width 8 used + me_cmp_func sad[6]; /* identical to pix_absAxA except additional void * */ + me_cmp_func sse[6]; + me_cmp_func hadamard8_diff[6]; + me_cmp_func dct_sad[6]; + me_cmp_func quant_psnr[6]; + me_cmp_func bit[6]; + me_cmp_func rd[6]; + me_cmp_func vsad[6]; + me_cmp_func vsse[6]; + me_cmp_func nsse[6]; + me_cmp_func w53[6]; + me_cmp_func w97[6]; + me_cmp_func dct_max[6]; + me_cmp_func dct264_sad[6]; + + me_cmp_func me_pre_cmp[6]; + me_cmp_func me_cmp[6]; + me_cmp_func me_sub_cmp[6]; + me_cmp_func mb_cmp[6]; + me_cmp_func ildct_cmp[6]; //only width 16 used + me_cmp_func frame_skip_cmp[6]; //only width 8 used int (*ssd_int8_vs_int16)(const int8_t *pix1, const int16_t *pix2, int size); |