diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-27 12:22:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-27 12:22:10 +0100 |
| commit | cdb9752a0f96373e80bcee71d19515c6c5605f23 (patch) | |
| tree | 98dba03c8082d746e638657ecdd943b03c97da21 /libavcodec | |
| parent | 04ec796bda7919058d6a75cf11b9a387a207375a (diff) | |
| parent | 845cfc92f908791714b8c4c8a49c91b8c64b685e (diff) | |
| download | ffmpeg-cdb9752a0f96373e80bcee71d19515c6c5605f23.tar.gz | |
Merge commit '845cfc92f908791714b8c4c8a49c91b8c64b685e'
* commit '845cfc92f908791714b8c4c8a49c91b8c64b685e':
x86: dsputil: Drop aliasing of ff_put_pixels8_mmx to ff_put_pixels8_mmxext
Conflicts:
libavcodec/x86/dsputil_mmx.c
Note, the commit message is wrong, there are no mmxext instructions as
claimed in the function. The change should do no harm though
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -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 231e0c53d1..45c086fe54 100644 --- a/libavcodec/x86/dsputil_mmx.c +++ b/libavcodec/x86/dsputil_mmx.c @@ -298,7 +298,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 */ @@ -1371,16 +1370,13 @@ 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 CONFIG_DIRAC_DECODER #define DIRAC_PIXOP(OPNAME2, OPNAME, EXT)\ @@ -1483,7 +1479,6 @@ static void ff_libmpeg2mmx2_idct_add(uint8_t *dest, int line_size, } #endif -#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 287e5a365e..d1e4b9d938 100644 --- a/libavcodec/x86/vc1dsp_mmx.c +++ b/libavcodec/x86/vc1dsp_mmx.c @@ -695,9 +695,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; |