diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-03 10:49:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-03 10:50:27 +0200 |
| commit | 05599308e98895e3c9aa6c1c90a2086aa029c42e (patch) | |
| tree | 82b97af2f49d4d863d231a58d84c9049fd9363ce /libavcodec/x86/dsputil_mmx.c | |
| parent | 35ef98013dfc8b9c4c4c3d6e87ff235b02cf71bc (diff) | |
| parent | bf7c3c6b157f7938578f964b62cffd5e504940be (diff) | |
Merge commit 'bf7c3c6b157f7938578f964b62cffd5e504940be'
* commit 'bf7c3c6b157f7938578f964b62cffd5e504940be':
x86: dsputil: Move cavs and vc1-specific functions where they belong
Conflicts:
libavcodec/x86/dsputil_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/dsputil_mmx.c')
| -rw-r--r-- | libavcodec/x86/dsputil_mmx.c | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/libavcodec/x86/dsputil_mmx.c b/libavcodec/x86/dsputil_mmx.c index 10fb43d9d0..624313b232 100644 --- a/libavcodec/x86/dsputil_mmx.c +++ b/libavcodec/x86/dsputil_mmx.c @@ -1045,7 +1045,6 @@ static av_always_inline void gmc(uint8_t *dst, uint8_t *src, } } - #if CONFIG_VIDEODSP #if HAVE_YASM #if ARCH_X86_32 @@ -1078,34 +1077,6 @@ static void gmc_mmx(uint8_t *dst, uint8_t *src, #endif #endif -/* CAVS-specific */ -void ff_put_cavs_qpel8_mc00_mmx(uint8_t *dst, uint8_t *src, ptrdiff_t stride) -{ - ff_put_pixels8_mmx(dst, src, stride, 8); -} - -void ff_avg_cavs_qpel8_mc00_mmx(uint8_t *dst, uint8_t *src, ptrdiff_t stride) -{ - ff_avg_pixels8_mmx(dst, src, stride, 8); -} - -void ff_put_cavs_qpel16_mc00_mmx(uint8_t *dst, uint8_t *src, ptrdiff_t stride) -{ - ff_put_pixels16_mmx(dst, src, stride, 16); -} - -void ff_avg_cavs_qpel16_mc00_mmx(uint8_t *dst, uint8_t *src, ptrdiff_t stride) -{ - ff_avg_pixels16_mmx(dst, src, stride, 16); -} - -/* VC-1-specific */ -void ff_put_vc1_mspel_mc00_mmx(uint8_t *dst, const uint8_t *src, - ptrdiff_t stride, int rnd) -{ - ff_put_pixels8_mmx(dst, src, stride, 8); -} - #if CONFIG_DIRAC_DECODER #define DIRAC_PIXOP(OPNAME2, OPNAME, EXT)\ void ff_ ## OPNAME2 ## _dirac_pixels8_ ## EXT(uint8_t *dst, const uint8_t *src[5], int stride, int h)\ |