diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-30 00:42:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-30 00:42:36 +0200 |
| commit | 5c6e94c42bcdc026071855a6b1749406b2456c8b (patch) | |
| tree | e8ce939224cce418e2069a83f41ad706c3fcd94a /libavcodec/dsputil.h | |
| parent | a9a312d299c785b4b4655ab70753aa5a2a933aae (diff) | |
| parent | 256da0770e495176d1b2699ec6e9c7993c2a6d7b (diff) | |
| download | ffmpeg-5c6e94c42bcdc026071855a6b1749406b2456c8b.tar.gz | |
Merge commit '256da0770e495176d1b2699ec6e9c7993c2a6d7b'
* commit '256da0770e495176d1b2699ec6e9c7993c2a6d7b':
dsputil: Move mspel_pixels_tab to the only place it is used
Conflicts:
libavcodec/dsputil.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dsputil.h')
| -rw-r--r-- | libavcodec/dsputil.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index b36ab2d8ca..c3c81547aa 100644 --- a/libavcodec/dsputil.h +++ b/libavcodec/dsputil.h @@ -39,6 +39,10 @@ void ff_avg_pixels8x8_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride); void ff_put_pixels16x16_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride); void ff_avg_pixels16x16_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride); +void ff_put_pixels8_l2_8(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, + int dst_stride, int src_stride1, int src_stride2, + int h); + void ff_gmc_c(uint8_t *dst, uint8_t *src, int stride, int h, int ox, int oy, int dxx, int dxy, int dyx, int dyy, int shift, int r, int width, int height); @@ -176,7 +180,6 @@ typedef struct DSPContext { 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]; - qpel_mc_func put_mspel_pixels_tab[8]; me_cmp_func pix_abs[2][4]; |