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 /libswscale/x86/swscale.c | |
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 'libswscale/x86/swscale.c')
-rw-r--r-- | libswscale/x86/swscale.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libswscale/x86/swscale.c b/libswscale/x86/swscale.c index 56ef3bc3a0..e82666bec9 100644 --- a/libswscale/x86/swscale.c +++ b/libswscale/x86/swscale.c @@ -80,7 +80,7 @@ DECLARE_ALIGNED(8, const uint64_t, ff_w1111) = 0x0001000100010001ULL; #include "swscale_template.c" #endif -//MMX2 versions +// MMXEXT versions #if HAVE_MMXEXT_INLINE #undef RENAME #undef COMPILE_TEMPLATE_MMXEXT |