diff options
| author | Diego Biurrun <diego@biurrun.de> | 2013-02-26 19:26:03 +0100 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2013-02-26 23:36:24 +0100 |
| commit | 845cfc92f908791714b8c4c8a49c91b8c64b685e (patch) | |
| tree | b736d26076e91b516540765c07c2b836701cb39a /libavcodec/x86 | |
| parent | 096cc11ec102701a18951b4f0437d609081ca1dd (diff) | |
| download | ffmpeg-845cfc92f908791714b8c4c8a49c91b8c64b685e.tar.gz | |
x86: dsputil: Drop aliasing of ff_put_pixels8_mmx to ff_put_pixels8_mmxext
The external assembly function uses mmxext instructions and should not be
masqueraded as an mmx-only function. Instead, use the mmx-only inline
assembly function.
Diffstat (limited to 'libavcodec/x86')
| -rw-r--r-- | libavcodec/x86/dsputil_mmx.c | 7 | ||||
| -rw-r--r-- | libavcodec/x86/vc1dsp_mmx.c | 2 |
2 files changed, 1 insertions, 8 deletions
diff --git a/libavcodec/x86/dsputil_mmx.c b/libavcodec/x86/dsputil_mmx.c index 161c7f34e0..5731040509 100644 --- a/libavcodec/x86/dsputil_mmx.c +++ b/libavcodec/x86/dsputil_mmx.c @@ -296,7 +296,6 @@ void ff_put_no_rnd_mpeg4_qpel8_v_lowpass_mmxext(uint8_t *dst, uint8_t *src, #if HAVE_YASM -#define ff_put_pixels8_mmx ff_put_pixels8_mmxext /***********************************/ /* 3Dnow specific */ @@ -1303,18 +1302,14 @@ void ff_avg_cavs_qpel16_mc00_mmxext(uint8_t *dst, uint8_t *src, int stride) { avg_pixels16_mmx(dst, src, stride, 16); } -#endif /* HAVE_INLINE_ASM */ -#if HAVE_YASM /* VC-1-specific */ void ff_put_vc1_mspel_mc00_mmx(uint8_t *dst, const uint8_t *src, int stride, int rnd) { - ff_put_pixels8_mmx(dst, src, stride, 8); + put_pixels8_mmx(dst, src, stride, 8); } -#endif /* HAVE_YASM */ -#if HAVE_INLINE_ASM static void vector_clipf_sse(float *dst, const float *src, float min, float max, int len) { diff --git a/libavcodec/x86/vc1dsp_mmx.c b/libavcodec/x86/vc1dsp_mmx.c index cc3b72b4eb..9db8f9e85c 100644 --- a/libavcodec/x86/vc1dsp_mmx.c +++ b/libavcodec/x86/vc1dsp_mmx.c @@ -696,9 +696,7 @@ static void vc1_inv_trans_8x8_dc_mmxext(uint8_t *dest, int linesize, av_cold void ff_vc1dsp_init_mmx(VC1DSPContext *dsp) { -#if HAVE_YASM dsp->put_vc1_mspel_pixels_tab[ 0] = ff_put_vc1_mspel_mc00_mmx; -#endif /* HAVE_YASM */ dsp->put_vc1_mspel_pixels_tab[ 4] = put_vc1_mspel_mc01_mmx; dsp->put_vc1_mspel_pixels_tab[ 8] = put_vc1_mspel_mc02_mmx; dsp->put_vc1_mspel_pixels_tab[12] = put_vc1_mspel_mc03_mmx; |