diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-31 17:02:35 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-31 17:02:35 +0400 |
| commit | 78ec407d5a7ed8a00d49e7555e2cc55e7786fd1d (patch) | |
| tree | f4bfafaf29f67c4e8224a8b2fac8a19c00a7c1f9 /libavcodec | |
| parent | 9766d9c9851577d8162d5f006dffc721902a1409 (diff) | |
| parent | 652f5185945c8405fc57aed353286858df8d066f (diff) | |
Merge commit '652f5185945c8405fc57aed353286858df8d066f'
* commit '652f5185945c8405fc57aed353286858df8d066f':
x86: mmx2 ---> mmxext in comments and messages
Conflicts:
libswscale/x86/swscale_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/x86/dsputil_avg_template.c | 2 | ||||
| -rw-r--r-- | libavcodec/x86/dsputil_mmx.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/x86/dsputil_avg_template.c b/libavcodec/x86/dsputil_avg_template.c index 6f768595c0..201f103714 100644 --- a/libavcodec/x86/dsputil_avg_template.c +++ b/libavcodec/x86/dsputil_avg_template.c @@ -1,5 +1,5 @@ /* - * DSP utils : average functions are compiled twice for 3dnow/mmx2 + * DSP utils : average functions are compiled twice for 3dnow/mmxext * Copyright (c) 2000, 2001 Fabrice Bellard * Copyright (c) 2002-2004 Michael Niedermayer * diff --git a/libavcodec/x86/dsputil_mmx.c b/libavcodec/x86/dsputil_mmx.c index 85c88f88b8..f3966bc8b9 100644 --- a/libavcodec/x86/dsputil_mmx.c +++ b/libavcodec/x86/dsputil_mmx.c @@ -206,11 +206,11 @@ DECLARE_ALIGNED(16, const double, ff_pd_2)[2] = { 2.0, 2.0 }; #undef OP_AVG /***********************************/ -/* MMX2 specific */ +/* MMXEXT specific */ #define DEF(x) x ## _mmx2 -/* Introduced only in MMX2 set */ +/* Introduced only in MMXEXT set */ #define PAVGB "pavgb" #define OP_AVG PAVGB |