diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-26 15:24:50 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-26 15:24:50 +0100 |
| commit | b4f64c58fc80585b9dc46f6ac6e385b2d55260a7 (patch) | |
| tree | 7ff1ebdb085a52c2dce75e6aefaedda443411eab /libavcodec/dsputil.h | |
| parent | 6967cf3c6c57dfdb831171f26f56fb1f521aed40 (diff) | |
| parent | da5be235250a61d6994408b054e3e3acf2e0f90f (diff) | |
| download | ffmpeg-b4f64c58fc80585b9dc46f6ac6e385b2d55260a7.tar.gz | |
Merge commit 'da5be235250a61d6994408b054e3e3acf2e0f90f'
* commit 'da5be235250a61d6994408b054e3e3acf2e0f90f':
dsputil: Move RV40-specific bits into rv40dsp
Conflicts:
libavcodec/dsputil.c
libavcodec/rv40dsp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dsputil.h')
| -rw-r--r-- | libavcodec/dsputil.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index 0730a78030..d01c3df4d1 100644 --- a/libavcodec/dsputil.h +++ b/libavcodec/dsputil.h @@ -44,12 +44,6 @@ 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); -/* RV40 functions */ -void ff_put_rv40_qpel16_mc33_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride); -void ff_avg_rv40_qpel16_mc33_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride); -void ff_put_rv40_qpel8_mc33_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride); -void ff_avg_rv40_qpel8_mc33_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride); - 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); |