diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-30 02:01:45 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-30 02:01:45 +0400 |
| commit | ea0931fb962f2436695606a8ef9a4811e4970e22 (patch) | |
| tree | b7e21eae75f3345b7c0d71855e7e611f1eca4f54 /libavcodec/dsputil.h | |
| parent | cb8763bda7e5e59064193e6b29b0f806560f66d3 (diff) | |
| parent | 65d5d5865845f057cc6530a8d0f34db952d9009c (diff) | |
Merge commit '65d5d5865845f057cc6530a8d0f34db952d9009c'
* commit '65d5d5865845f057cc6530a8d0f34db952d9009c':
dsputil: Move SVQ1 encoding specific bits into svq1enc
Conflicts:
libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dsputil.h')
| -rw-r--r-- | libavcodec/dsputil.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index df685a594d..5c48f0d5c7 100644 --- a/libavcodec/dsputil.h +++ b/libavcodec/dsputil.h @@ -177,9 +177,6 @@ typedef struct DSPContext { 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); - qpel_mc_func put_qpel_pixels_tab[2][16]; qpel_mc_func avg_qpel_pixels_tab[2][16]; qpel_mc_func put_no_rnd_qpel_pixels_tab[2][16]; |