diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-19 13:18:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-19 13:20:25 +0100 |
| commit | ed8ff70d9ee02b9940803aee69462da548df663b (patch) | |
| tree | 495891dd23a7f45f12682670719fe00a2c26fef0 /libavcodec | |
| parent | b45e0c2573fa5ce8c4821605f35ac4cad946e9d3 (diff) | |
| parent | 822b0728f0e3c3ba60b20bd4fd971d5c4a3fe3e9 (diff) | |
| download | ffmpeg-ed8ff70d9ee02b9940803aee69462da548df663b.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: dsputil: Drop some unused macro definitions
x86: Add a Yasm-based emms() replacement
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/x86/dsputil_mmx.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/libavcodec/x86/dsputil_mmx.c b/libavcodec/x86/dsputil_mmx.c index 73001d8677..80a6a30849 100644 --- a/libavcodec/x86/dsputil_mmx.c +++ b/libavcodec/x86/dsputil_mmx.c @@ -197,14 +197,12 @@ DECLARE_ALIGNED(16, const double, ff_pd_2)[2] = { 2.0, 2.0 }; #define DEF(x) x ## _3dnow #define PAVGB "pavgusb" -#define OP_AVG PAVGB #define SKIP_FOR_3DNOW #include "dsputil_avg_template.c" #undef DEF #undef PAVGB -#undef OP_AVG #undef SKIP_FOR_3DNOW /***********************************/ @@ -214,13 +212,11 @@ DECLARE_ALIGNED(16, const double, ff_pd_2)[2] = { 2.0, 2.0 }; /* Introduced only in MMXEXT set */ #define PAVGB "pavgb" -#define OP_AVG PAVGB #include "dsputil_avg_template.c" #undef DEF #undef PAVGB -#undef OP_AVG #define put_no_rnd_pixels16_mmx put_pixels16_mmx #define put_no_rnd_pixels8_mmx put_pixels8_mmx |