diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-26 18:24:50 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-26 18:24:50 +0400 |
| commit | b4f64c58fc80585b9dc46f6ac6e385b2d55260a7 (patch) | |
| tree | 7ff1ebdb085a52c2dce75e6aefaedda443411eab /libavcodec/dsputil.c | |
| parent | 6967cf3c6c57dfdb831171f26f56fb1f521aed40 (diff) | |
| parent | da5be235250a61d6994408b054e3e3acf2e0f90f (diff) | |
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.c')
| -rw-r--r-- | libavcodec/dsputil.c | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c index aba82f3233..b1239a5995 100644 --- a/libavcodec/dsputil.c +++ b/libavcodec/dsputil.c @@ -1314,28 +1314,6 @@ static void wmv2_mspel8_h_lowpass(uint8_t *dst, uint8_t *src, } } -#if CONFIG_RV40_DECODER -void ff_put_rv40_qpel16_mc33_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride) -{ - put_pixels16_xy2_8_c(dst, src, stride, 16); -} - -void ff_avg_rv40_qpel16_mc33_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride) -{ - avg_pixels16_xy2_8_c(dst, src, stride, 16); -} - -void ff_put_rv40_qpel8_mc33_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride) -{ - put_pixels8_xy2_8_c(dst, src, stride, 8); -} - -void ff_avg_rv40_qpel8_mc33_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride) -{ - avg_pixels8_xy2_8_c(dst, src, stride, 8); -} -#endif /* CONFIG_RV40_DECODER */ - #if CONFIG_DIRAC_DECODER #define DIRAC_MC(OPNAME)\ void ff_ ## OPNAME ## _dirac_pixels8_c(uint8_t *dst, const uint8_t *src[5], int stride, int h)\ |